93ce09f63f
Merge pull request #7357 from LetterN/mapsmapsmaps
...
readds the cryo and lewdstuff on the map
2018-07-10 02:00:44 -04:00
0235f37fd0
Merge pull request #7339 from Trilbyspaceclone/patch-3
...
Adds more to the Autodrobe coin slot!
2018-07-10 02:00:06 -04:00
fc9b99173b
Merge pull request #7344 from LetterN/fix-1
...
fixes lewd handcuffs
2018-07-10 01:59:36 -04:00
4f5eb02cca
Merge pull request #7338 from Citadel-Station-13/upstream-merge-38649
...
[MIRROR] Converts antimagic from GetComponent to a signal
2018-07-10 01:59:14 -04:00
21b6c7986b
Merge pull request #7193 from Citadel-Station-13/kevinz000-patch-13
...
Cyborgs now drop their encryption keys on detonation/deconstruction
2018-07-10 01:58:59 -04:00
78241f4237
Merge pull request #7351 from Citadel-Station-13/upstream-merge-38930
...
[MIRROR] Cleans up other components destroys
2018-07-10 01:58:36 -04:00
d904b54e7c
Merge pull request #7350 from Citadel-Station-13/upstream-merge-38929
...
[MIRROR] Fixes animals trying to break map border
2018-07-10 01:58:19 -04:00
d1d6f8d6a3
Automatic changelog generation for PR #7349 [ci skip]
2018-07-10 00:58:04 -05:00
bf89d077ba
Merge pull request #7349 from Citadel-Station-13/upstream-merge-38932
...
[MIRROR] Disables knockdown/throw on supply shuttle docking
2018-07-10 01:58:02 -04:00
8025ba5a1f
Merge pull request #7348 from Citadel-Station-13/upstream-merge-38935
...
[MIRROR] minor turf reservation fix - no longer reserves 1 more height+width than necessary, checks against invalid sizes
2018-07-10 01:57:46 -04:00
8942d90a66
Automatic changelog generation for PR #7346 [ci skip]
2018-07-10 00:57:32 -05:00
03f3c6b993
Merge pull request #7346 from Citadel-Station-13/upstream-merge-38927
...
[MIRROR] Improves cargo shuttle/firefighting foam descs
2018-07-10 01:57:30 -04:00
4cdd3bbaa1
Merge pull request #7352 from Citadel-Station-13/upstream-merge-38931
...
[MIRROR] Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-10 01:57:08 -04:00
762b789622
Automatic changelog generation for PR #7353 [ci skip]
2018-07-10 00:56:49 -05:00
55e5d803aa
Merge pull request #7353 from Citadel-Station-13/upstream-merge-38883
...
[MIRROR] Bedsheets once again influence dreams.
2018-07-10 01:56:47 -04:00
33e732d983
Automatic changelog generation for PR #7355 [ci skip]
2018-07-10 00:56:34 -05:00
8b58db057e
Merge pull request #7355 from Citadel-Station-13/upstream-merge-38934
...
[MIRROR] Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects
2018-07-10 01:56:32 -04:00
6a5087877b
Merge pull request #7129 from PolymorphBlue/vTecControl
...
Modifies the vTec cyborg upgrade to be toggleable between off/half/full
2018-07-09 00:26:23 -04:00
8ea39ec1b6
Automatic changelog generation for PR #7358 [ci skip]
2018-07-07 20:09:26 -05:00
42d340880d
Merge pull request #7358 from deathride58/fixusacape
...
Fixes democracy
2018-07-07 20:09:24 -05:00
c1ae3a7ba6
fixes democracy
2018-07-07 14:10:32 -04:00
e54cf2ce21
pubbypubbypubby
2018-07-07 22:05:04 +08:00
c3bdd0f3bb
omegaomegaomega
2018-07-07 22:03:55 +08:00
e05ca517ad
metametametagame
2018-07-07 22:02:45 +08:00
084e8b4e00
deltadeltadelta
2018-07-07 22:01:49 +08:00
958249ba03
boxboxbox
2018-07-07 22:00:46 +08:00
8facd5fd19
Merge pull request #3 from Citadel-Station-13/master
...
sink
2018-07-07 21:59:28 +08:00
a96b97a2b0
icon fix
2018-07-06 17:38:55 -05:00
23ddf451a1
Merge pull request #7347 from Citadel-Station-13/kevinz000-patch-7
...
Removes the rest spam from spam- I mean, dance machine
2018-07-06 17:08:46 -04:00
0eb2e09934
Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects
2018-07-06 13:28:01 -05:00
417496aa6e
Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects ( #38934 )
...
* Wrap setting anchored for structures, fix atmos bug
* forgot this
* Add a signal for setanchored
* move setanchored to obj
* machinery, also some structure stuff
* tabbing
2018-07-06 13:28:01 -05:00
554e1c58d2
Bedsheets once again influence dreams.
2018-07-06 11:45:11 -05:00
ea93edc21f
Fixes #38878 : Bedsheets once again influence dreams. ( #38883 )
2018-07-06 11:45:11 -05:00
5988d00a81
Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-06 11:40:54 -05:00
f36ab6982b
Fixes pulse rifles exploding structures in nullspace and that sort of thing ( #38931 )
...
* memes
* i just woke up ok
2018-07-06 11:40:54 -05:00
3d55d22504
Cleans up other components destroys
2018-07-06 11:39:42 -05:00
cc1070c7db
Cleans up other components destroys ( #38930 )
...
* wearertargeting destroy
* Why did these variables even existed.
* ....
2018-07-06 11:39:42 -05:00
b4eac3a81e
Fixes animals trying to break map border
2018-07-06 11:39:34 -05:00
dd8461d0a0
Fixes animals trying to break map border ( #38929 )
2018-07-06 11:39:34 -05:00
fcb3eb8267
Disables knockdown/throw on supply shuttle docking
2018-07-06 11:37:18 -05:00
1336a555d4
Disables knockdown/throw on supply shuttle docking ( #38932 )
2018-07-06 11:37:18 -05:00
a99169d8ab
minor turf reservation fix - no longer reserves 1 more height+width than necessary, checks against invalid sizes
2018-07-06 11:35:34 -05:00
a53c7a71ea
minor turf reservation fix ( #38935 )
...
no longer reserves 1 more height+width than necessary, checks against invalid sizes
2018-07-06 11:35:34 -05:00
04993d4dba
Update dance_machine.dm
2018-07-06 08:16:41 -07:00
6ae67787d7
Improves cargo shuttle/firefighting foam descs
2018-07-06 09:42:33 -05:00
023f53a470
Improves cargo shuttle/firefighting foam descs ( #38927 )
...
* Improves cargo shuttle/firefighting foam descs
* oof
2018-07-06 09:42:33 -05:00
5c79a794ec
Update holy_weapons.dm
2018-07-06 17:20:30 +08:00
bff55cc362
Update handcuffs.dm
2018-07-06 17:19:56 +08:00
15029f8034
Add files via upload
2018-07-06 17:18:55 +08:00
7cc32db240
Delete weapons.dmi
2018-07-06 17:12:16 +08:00
deathride58