Skip to content

Gunner #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
firebudgy merged 116 commits into from
Aug 6, 2025
Merged

Gunner #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
2aec97e
The Lawnmower: Touching Grass Edition (turf hell) (#5030)
Zevotech Jul 19, 2025
f47ec6b
Automatic changelog generation for PR #5030 [ci skip]
actions-user Jul 19, 2025
57c3a9e
restore minutebar fluff (#5098)
Erikafox Jul 19, 2025
9a58539
Automatic changelog generation for PR #5098 [ci skip]
actions-user Jul 19, 2025
f141388
remove minefields (#5091)
Erikafox Jul 19, 2025
a50a296
Automatic changelog generation for PR #5091 [ci skip]
actions-user Jul 19, 2025
69d7334
Automatic changelog compile [ci skip]
actions-user Jul 20, 2025
4d361c9
fixes holocall from undefined (#5090)
Erikafox Jul 20, 2025
d6b2c85
Automatic changelog generation for PR #5090 [ci skip]
actions-user Jul 20, 2025
9ac22f4
Automatic changelog compile [ci skip]
actions-user Jul 21, 2025
218e66f
thronglers deal more damage but have a wound bonus and spread it out …
Erikafox Jul 21, 2025
aac5bdd
Automatic changelog generation for PR #5100 [ci skip]
actions-user Jul 21, 2025
1783f30
Fixes being able to understand sign language without knowing sign lan…
SapphicOverload Jul 21, 2025
dd4c974
Automatic changelog generation for PR #4814 [ci skip]
actions-user Jul 21, 2025
518330d
Automatic changelog compile [ci skip]
actions-user Jul 22, 2025
0b721b6
Onehalf Tweaks (#5067)
generalthrax Jul 23, 2025
05e32a7
Automatic changelog generation for PR #5067 [ci skip]
actions-user Jul 23, 2025
c5d2302
NSSV Kiwi-class Prospector (#5056)
moffball19 Jul 24, 2025
5e5ecec
Automatic changelog generation for PR #5056 [ci skip]
actions-user Jul 24, 2025
32860ff
Automatic changelog compile [ci skip]
actions-user Jul 24, 2025
2fdb43d
remove deepthroat (#5112)
generalthrax Jul 24, 2025
8ffbe23
Ramzi Assets (in 2021) (#5080)
thearbiber Jul 24, 2025
41693b8
Automatic changelog generation for PR #5080 [ci skip]
actions-user Jul 24, 2025
feadd88
Automatic changelog compile [ci skip]
actions-user Jul 25, 2025
093776f
Brings back the Oldskipper + Makes it Hardline (#5081)
generalthrax Jul 25, 2025
916ca5b
Automatic changelog generation for PR #5081 [ci skip]
actions-user Jul 25, 2025
e77de92
Automatic changelog compile [ci skip]
actions-user Jul 26, 2025
0e881e5
[Please God Testmerge This] Ports Jitter/Drunkenness/Dizziness as sta…
Erikafox Jul 26, 2025
8d583ad
Automatic changelog generation for PR #4928 [ci skip]
actions-user Jul 26, 2025
6bc5ed3
Ballistic Shield Balancing (#5072)
generalthrax Jul 26, 2025
3670fc2
fix #4713 (#5108)
SomeguyManperson Jul 26, 2025
50895e1
Allows bodycameras to be worn around the neck (#5110)
zimon9 Jul 26, 2025
7a04d66
Automatic changelog generation for PR #5072 [ci skip]
actions-user Jul 26, 2025
cd07759
fix #4362 (#5106)
SomeguyManperson Jul 26, 2025
319799e
Automatic changelog generation for PR #5108 [ci skip]
actions-user Jul 26, 2025
1e96eea
Automatic changelog generation for PR #5110 [ci skip]
actions-user Jul 26, 2025
a83110e
Scope Audit (#5086)
generalthrax Jul 26, 2025
cd0892b
Automatic changelog generation for PR #5086 [ci skip]
actions-user Jul 26, 2025
782f7de
remove panacea (#5121)
Erikafox Jul 26, 2025
bfee6cb
Automatic changelog generation for PR #5121 [ci skip]
actions-user Jul 26, 2025
84dbede
fix ssg not taking scope (#5123)
Erikafox Jul 26, 2025
e61aa79
fixes invictus mag cargo (#5120)
generalthrax Jul 26, 2025
a2f6161
Automatic changelog generation for PR #5123 [ci skip]
actions-user Jul 26, 2025
c7d5c73
Automatic changelog generation for PR #5120 [ci skip]
actions-user Jul 26, 2025
81b7ec6
Automatic changelog compile [ci skip]
actions-user Jul 27, 2025
a41ca15
Fixes build.js so that it properly prepends #define CBS, suppressing …
Anticept Jul 27, 2025
9673853
Automatic changelog generation for PR #5033 [ci skip]
actions-user Jul 27, 2025
46a8773
Automatic changelog compile [ci skip]
actions-user Jul 28, 2025
6519ecb
Fixes manifest and join menu UIs not updating properly (#5019)
SapphicOverload Jul 28, 2025
7b16467
Automatic changelog generation for PR #5019 [ci skip]
actions-user Jul 28, 2025
807c465
Automatic changelog compile [ci skip]
actions-user Jul 29, 2025
73470e3
Fixes #5122 (#5137)
SomeguyManperson Jul 29, 2025
d2fcac8
Automatic changelog generation for PR #5137 [ci skip]
actions-user Jul 29, 2025
13911b8
Automatic changelog compile [ci skip]
actions-user Jul 30, 2025
d65d54b
Vigilitas deepstorage - New space ruin (also shoots bigderelict1) (#5…
thearbiber Jul 30, 2025
0a3c704
Adds the Venetia-class Frontier Yacht (#5109)
thearbiber Jul 30, 2025
f0bc79d
Automatic changelog generation for PR #5109 [ci skip]
actions-user Jul 30, 2025
1c6f779
fixes onehalfs holofields (#5141)
generalthrax Jul 30, 2025
fe6c284
Automatic changelog generation for PR #5141 [ci skip]
actions-user Jul 30, 2025
06cba2a
Removes shuttles from Autowiki Shiptable generations (#5142)
Ical92 Jul 30, 2025
c5715a4
Automatic changelog compile [ci skip]
actions-user Jul 31, 2025
fcd9c91
516 TGUI Hotfix (#5131)
MarkSuckerberg Jul 31, 2025
2a1933f
Automatic changelog generation for PR #5131 [ci skip]
actions-user Jul 31, 2025
f894a21
fix laughs not happening (#5115)
Erikafox Jul 31, 2025
fbb7d8c
Automatic changelog generation for PR #5115 [ci skip]
actions-user Jul 31, 2025
835557f
Makes some adjustments to the Harrier. (#5071)
Aquidu Jul 31, 2025
ae48d1f
Automatic changelog generation for PR #5071 [ci skip]
actions-user Jul 31, 2025
fff1b27
Removes the F4's Pre-Attached Scope and makes it Integrated (#5144)
generalthrax Jul 31, 2025
b7504d2
Automatic changelog generation for PR #5144 [ci skip]
actions-user Jul 31, 2025
8d1feee
removes sand world gibtonite (#5145)
generalthrax Jul 31, 2025
cde80f2
Automatic changelog generation for PR #5145 [ci skip]
actions-user Jul 31, 2025
839c3b7
resprites some underwear tops (#5140)
thearbiber Jul 31, 2025
83c19dc
Automatic changelog generation for PR #5140 [ci skip]
actions-user Jul 31, 2025
c6a9f6b
Automatic changelog compile [ci skip]
actions-user Aug 1, 2025
76d014a
Suit Storage Locks now respect access (#5136)
Gristlebee Aug 1, 2025
aaddc31
EMPs can longer randomize locker access (#5124)
Gristlebee Aug 1, 2025
5379edb
removes spraypainting clothes (#5103)
Erikafox Aug 1, 2025
dfdde62
Automatic changelog generation for PR #5136 [ci skip]
actions-user Aug 1, 2025
7c96eef
Automatic changelog generation for PR #5124 [ci skip]
actions-user Aug 1, 2025
b910599
Make it so suit pockets are openable again (#5117)
ritorizo Aug 1, 2025
c64b6a1
Automatic changelog generation for PR #5103 [ci skip]
actions-user Aug 1, 2025
b36a79f
Remove purchasing concealed weapons bays (#5101)
Erikafox Aug 1, 2025
95f45da
Nerf Solaris (#5102)
Erikafox Aug 1, 2025
5908fac
Automatic changelog generation for PR #5102 [ci skip]
actions-user Aug 1, 2025
8e4f690
remove fax spam (#5126)
Erikafox Aug 1, 2025
07d41cb
Automatic changelog generation for PR #5126 [ci skip]
actions-user Aug 1, 2025
d6b5141
Fixes the volume of epipens so all reagents are added to a body upon …
zimon9 Aug 1, 2025
f96e0cf
Automatic changelog generation for PR #5134 [ci skip]
actions-user Aug 1, 2025
f75a6cf
Prevents ion storms from softlocking ships (#4996)
SapphicOverload Aug 1, 2025
96d0701
Automatic changelog generation for PR #4996 [ci skip]
actions-user Aug 1, 2025
54b7473
Garden/Geyser Scanning (#5055)
Erikafox Aug 1, 2025
2f0acad
Automatic changelog generation for PR #5055 [ci skip]
actions-user Aug 1, 2025
7b8e97e
Breach Mining (#5057)
Erikafox Aug 1, 2025
e378b53
Automatic changelog generation for PR #5057 [ci skip]
actions-user Aug 1, 2025
1d712e4
Automatic changelog compile [ci skip]
actions-user Aug 2, 2025
cc06440
adds three new ponytails (more hairs) (#5158)
thearbiber Aug 3, 2025
94612ec
Automatic changelog generation for PR #5158 [ci skip]
actions-user Aug 3, 2025
53ab195
pew resprite (#5146)
thearbiber Aug 3, 2025
16a0288
Automatic changelog generation for PR #5146 [ci skip]
actions-user Aug 3, 2025
0b9f9d6
Automatic changelog compile [ci skip]
actions-user Aug 3, 2025
711a9db
Atom integrity and armor (#4825)
FalloutFalcon Aug 3, 2025
d0489cf
fix gelled bone wounds not processing (#5159)
Erikafox Aug 4, 2025
99af5df
Automatic changelog generation for PR #5159 [ci skip]
actions-user Aug 4, 2025
04a6686
replace cirrus rattlesnakes with cobras (#5128)
Erikafox Aug 4, 2025
560c278
Automatic changelog generation for PR #5128 [ci skip]
actions-user Aug 4, 2025
bbb09a3
Cthonian-Revamp-V2,-because-the-first-one-got-eaten (#5167)
DIB-DOG Aug 5, 2025
3dcf3df
Automatic changelog compile [ci skip]
actions-user Aug 5, 2025
8e2083e
Corrects Coffee Machines (#5133)
Ossa88 Aug 5, 2025
dc5616f
Automatic changelog generation for PR #5133 [ci skip]
actions-user Aug 5, 2025
3b329d5
Fixes missing blockade functionality (#5156)
Ical92 Aug 5, 2025
ac2f85c
Automatic changelog generation for PR #5156 [ci skip]
actions-user Aug 5, 2025
1dec66f
Minor Atira Improvements & Fixes (#5166)
Ical92 Aug 5, 2025
7d8565e
Automatic changelog generation for PR #5166 [ci skip]
actions-user Aug 5, 2025
81cb2df
Automatic changelog compile [ci skip]
actions-user Aug 6, 2025
caa1019
mob
generalthrax Aug 6, 2025
7e5ff51
Merge branch 'shiptest-ss13:master' into gunner
generalthrax Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions _maps/RandomRuins/IceRuins/icemoon_training_center.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,9 +1683,9 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/obj/item/clothing/head/HoS/syndicate,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/under/syndicate/hardliners/officer,
/obj/item/clothing/under/syndicate/ramzi/officer,
/obj/item/clothing/head/ramzi/peaked,
/obj/item/clothing/suit/armor/ramzi/captain,
/turf/open/floor/wood,
/area/ruin/icemoon/training_facility/office_2)
"ik" = (
Expand Down
Loading