LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
deathride58
5b6bdce965
Update mousetrap.dm
2017-12-06 13:20:33 -05:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
Jordan Brown
ee8ca86e3a
Merge pull request #33192 from Robustin/SavioroftheUniverse
...
Fixes terrible Flash logic
2017-12-02 09:43:25 -06:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
Jordie
752bc654ae
Makes some turning procs consistently turn clockwise
2017-11-19 22:25:17 -06:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
Dax Dupont
ac23bd3261
Prevents proximity sensors from beeping when off. ( #32783 )
2017-11-16 17:10:11 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
ACCount
5d81ec7ba6
Fixes a bug in single tank bomb assembly ( #32341 )
2017-11-04 11:43:50 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
AnturK
2ecb4c216c
Datum rev & related upgrades to base datum antag
2017-10-18 02:26:11 -05:00
kevinz000
fbf5568547
Update bomb.dm ( #31557 )
2017-10-12 12:36:48 -05:00
LetterJay
dc5aeb33e6
Merge pull request #3294 from Citadel-Station-13/upstream-merge-31475
...
[MIRROR] Removes spawns from assembly code
2017-10-12 12:36:53 -04:00
LetterJay
2e503acc57
Update assembly.dm
2017-10-12 06:21:30 -05:00
LetterJay
f93733576e
Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
...
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
duncathan salt
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
PKPenguin321
33afe4f0ca
Removes unwelding a singletank ( #31550 )
...
Fixes #27341
2017-10-12 00:28:58 -05:00
MoreRobustThanYou
5eb76bb6e1
Removes spawns from assembly code
2017-10-10 13:30:59 -05:00
MoreRobustThanYou
6578ae1f5c
Gets rid of spawns in buttons ( #31468 )
...
* Gets rid of spawns in buttons
* Update doorcontrol.dm
2017-10-09 19:01:37 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
CitadelStationBot
7dc9ac7e2d
[MIRROR] Fixed small error causing signalers to fail to attach to each other in an assembly ( #2750 )
...
* Fixed small error in signalers causing signalers to fail to attach to eachother in an assembly (#30675 )
* Fixed small error causing signalers to fail to attach to each other in an assembly
2017-09-14 07:36:13 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
LetterJay
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
CitadelStationBot
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
CitadelStationBot
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
CitadelStationBot
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
CitadelStationBot
54da14ea6b
Rename Bumped to CollidedWith ( #2017 )
2017-07-15 11:44:12 -07:00
CitadelStationBot
2d3905457e
[MIRROR] Rename Bump to Collide ( #2002 )
...
* Rename Bump to Collide
* Delete bubblegum.dm.rej
* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
CitadelStationBot
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
CitadelStationBot
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
CitadelStationBot
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
CitadelStationBot
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
