10b9e8ab99
Merge pull request #7023 from Citadel-Station-13/lmao
...
Telebatons/policebatons buffed to be a viable stun weapon (but not as good as stunbatons/prods), secways nerfed to non-sprint movespeed with sprint buffer (but this time they're actually responsive instead of being laggy and the buffer is weaker)
2018-07-15 17:51:12 -04:00
0b8e72b19b
nerf 50-->40
2018-07-10 05:58:44 -07:00
c8b9e94d1e
Merge pull request #7354 from Trilbyspaceclone/patch-6
...
Removes armor form Non-head only Trek suits
2018-07-10 02:04:18 -04:00
914967f081
Merge pull request #7356 from Trilbyspaceclone/WT-550
...
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
2018-07-10 02:03:08 -04:00
1145a66ec3
Merge pull request #7345 from LetterN/patch-5
...
adds plushnar and plushvar on chapvendors
2018-07-10 02:01:21 -04:00
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
00f84818a1
Remove spaces at the ends of the paths
...
Ima dork and forgot to remove those
2018-07-07 09:13:23 -04:00
1e31149039
Removes the //Cit Change
2018-07-07 00:48:04 -04:00
a96b97a2b0
icon fix
2018-07-06 17:38:55 -05:00
fb9f85f6fc
Trys to code something for 10 hours and fails at it.exe
2018-07-06 18:37:48 -04:00
d6715b16b0
Try's to code in something poorly.exe
2018-07-06 18:26:42 -04:00
ffc5c6935a
Lets see If I did this correct this time!
2018-07-06 18:01:29 -04:00
7f9365e1db
Modularized, plz dont yell at me
2018-07-06 17:42:24 -04:00
54779cae1d
Modularized, plz dont yell at me
2018-07-06 17:37:50 -04:00
71c259b0c4
MoModularized, plz don't yell at me
2018-07-06 17:33:07 -04: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
5698720335
Merge branch 'WT-550' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into WT-550
2018-07-06 15:50:45 -04:00
d764f5128a
Adds in the ammo and the bullet!
2018-07-06 15:49:19 -04:00
64b1fca976
Update weapon_designs.dm
2018-07-06 14:59:26 -04:00
b3ecedff4f
Update weapon_designs.dm
2018-07-06 14:49:28 -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
0b0820937d
Update trek_under.dm
2018-07-06 14:03:04 -04:00
619a64173f
Hopefully this will add in the missing WT-550 Toxin Ammo for sec to use! (Combat medics will use this to heal slime's more then likely as well)
2018-07-06 13:56:06 -04:00
deathride58