Ghom
a96f6238df
Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
...
[Ready]Better crate options
2020-04-12 05:48:20 +02:00
Putnam3145
64254ed384
Merge pull request #11647 from BlackMajor/SpaceRuins
...
Fixes welded lockers spamming chatlogs when resisting.
2020-03-27 00:35:40 -07:00
BlackMajor
aa07bf262a
lmao one line fix
2020-03-27 20:32:53 +13:00
Ghommie
36d5d5e141
Antagonists such as wizard and nuke ops are now more anonymous.
2020-03-25 23:33:50 +01:00
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
necromanceranne
94c700a06c
NVG Nerf/Syndicate NVG Buff ( #11548 )
...
* nerfs the shit out of nvg and gives syndicate special flashproof versions
* forgot about this one
* bleh
2020-03-21 15:31:59 +01:00
Ghommie
ad4d290ea7
WIP
2020-03-08 19:26:01 +01:00
kevinz000
c736568a5a
Merge pull request #11369 from Ghommie/Ghommie-cit609
...
Porting the musician and curator beacons.
2020-03-08 07:34:48 -07:00
Ghommie
a817bd6115
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
Trilbyspaceclone
178de5ee0d
Merge branch 'master' into more_crates+bags
2020-03-06 06:31:54 -05:00
kevinz000
16d6ba9e21
Merge pull request #11323 from Ghommie/Ghommie-cit600
...
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
Ghommie
60c7268e37
Also fixing bloodsucker coffins.
2020-03-04 16:29:09 +01:00
kevinz000
8b0b685fa7
CHECK_MOBILITY
2020-03-03 20:40:33 -07:00
kevinz000
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
ancientpower
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
Lin
5ee4a355c1
Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
...
Fixing refrigerators locking when closed
2020-02-29 00:21:43 -06:00
ancientpower
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
deathride58
c232356a88
Makes clicking open closets with items on harm intent attack the closet rather than put the item in the closet
2020-02-26 09:51:48 -05:00
kevinz000
59e95555bb
Merge remote-tracking branch 'citadel/master' into staves
2020-02-24 13:09:45 -07:00
kevinz000
424eb48d9e
fixes
2020-02-24 01:59:45 -07:00
Trilbyspaceclone
becdd3c4c1
Merge branch 'master' into more_crates+bags
2020-02-22 18:33:26 -05:00
kevinz000
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
Ghom
503214dee6
Update freezer.dm
2020-02-21 02:26:52 +01:00
Ghom
89f256866d
Merge pull request #11033 from kevinz000/cmo_drapes
...
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
2020-02-20 11:24:50 +01:00
kevinz000
b66b8ac2a0
Merge remote-tracking branch 'citadel/master' into staves
2020-02-19 14:32:28 -07:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
Ghom
0619521418
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
...
Corrects a few cargo crates/exports (and nerfs some)
2020-02-19 02:10:25 +01:00
kevinz000
8666a36b1e
fixes most things
2020-02-18 02:24:31 -07:00
kevinz000
d7949e810e
Merge remote-tracking branch 'citadel/master' into staves
2020-02-18 02:20:58 -07:00
kevinz000
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Ghom
121b37410a
Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
...
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
Ghom
5730b717c5
Merge pull request #10969 from Seris02/crowbarcrate
...
allows you to wirecutters the manifests off crates without opening them
2020-02-13 09:41:10 +01:00
Seris02
4ac7fff7e3
ye
2020-02-13 13:37:47 +08:00
kevinz000
70e752dbc9
this is totally not laggy
2020-02-11 23:45:22 -07:00
ShadeAware
bbedf617f5
Declutters the Locker
2020-02-11 17:33:18 -05:00
Ghommie
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
Winter Flare
bb641fecf8
Sprites, Tweaks, and Snacks
...
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.
Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
TrilbySpaceClone
e5236eebb1
hey lets do corrections
2020-02-08 17:39:00 -05:00
Seris02
6d8bfd2a38
tru
2020-02-08 14:01:51 +08:00
Seris02
6af421994a
yay
2020-02-08 13:53:43 +08:00
Ghommie
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
kevinz000
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
kevinz000
f3d955f397
Merge branch 'master' into staves
2020-02-04 14:54:35 -07:00
kevinz000
97583bd98f
Merge pull request #10853 from Ghommie/Ghommie-cit549
...
A PR about runtime errors
2020-02-04 03:20:34 -07:00
TrilbySpaceClone
c8dff8fbc5
it just works
2020-02-04 04:18:44 -05:00
Ghommie
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
kevinz000
8556bcf2b3
compile
2020-02-03 13:36:10 -07:00
