CitadelStationBot
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
CitadelStationBot
d21766956e
[MIRROR] Cleaned up some emag_acts ( #2018 )
...
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
2017-07-15 13:17:56 -07:00
ktccd
6d3123f63c
Readds borers ( #1999 )
...
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
CitadelStationBot
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
488f6350ed
Revert "Freezers and heaters now drop the correct materials" ( #1819 )
2017-06-30 20:49:04 -07:00
CitadelStationBot
9d5e51777b
use_power var now uses a define to reflect it not being a bool ( #1842 )
2017-06-30 20:41:59 -07:00
CitadelStationBot
ec253c4e28
[MIRROR] cryotube pod improvements ( #1681 )
...
* Bay-like cryotube pods
* Update cryo.dm
* Delete cryo.dm.rej
* Delete cryo.dm
* cryogenics.dmi
2017-06-28 04:01:35 -05:00
CitadelStationBot
595f50c95e
Freezers and heaters now drop the correct materials ( Fixes #28560 )
2017-06-19 21:27:30 -05:00
LetterJay
dfabe6ccf7
Merge pull request #1639 from Citadel-Station-13/upstream-merge-28503
...
[MIRROR] Fixes #28500 : Cryo cells properly compare to a mob's max health
2017-06-17 10:06:14 -05:00
CitadelStationBot
c3fe3f674f
Fixes #28500 : Cryo cells properly compare to a mob's max health
2017-06-17 07:36:24 -05:00
CitadelStationBot
185d0cd3f4
Adjusted atmos device layers + added new pipe subtypes
2017-06-16 15:25:38 -05:00
LetterJay
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
LetterJay
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
CitadelStationBot
2e75f2e61c
gas miners only update overlays when they actually need to
2017-06-07 03:06:05 -05:00
CitadelStationBot
fc2f45b71b
Lowers portable pump max pressure to 1013.25
2017-05-31 23:14:26 -05:00
LetterJay
869953cd18
Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503
...
[MIRROR] Changes investigate logs to use a define
2017-05-24 12:34:36 -05:00
CitadelStationBot
9fa0539f74
Fixes cryo radios
2017-05-24 08:24:39 -05:00
LetterJay
e966230ed9
logging
2017-05-24 08:19:45 -05:00
LetterJay
006c74c6ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503
2017-05-24 08:11:07 -05:00
LetterJay
dd6e5c8368
Merge pull request #1098 from Citadel-Station-13/upstream-merge-27460
...
[MIRROR] Fixes built air meters not working
2017-05-23 07:14:24 -05:00
CitadelStationBot
01cd2039e5
Changes investigate logs to use a define
2017-05-22 22:45:54 -05:00
CitadelStationBot
73aa9346e3
Fixes built air meters not working
2017-05-21 22:29:15 -05:00
CitadelStationBot
f132720d7e
Since you can properly scrub Freon now, it doesn't destroy itself.
2017-05-21 22:28:47 -05:00
LetterJay
6d3e9f9c50
mob_occupant to occupant
2017-05-19 22:33:26 -05:00
CitadelStationBot
c61bb0476f
[MIRROR] Cleans up some Initializes ( #943 )
...
* Cleans up some Initializes
* Update farm_animals.dm
* Delete farm_animals.dm.rej
* Update farm_animals.dm
2017-05-18 11:13:53 -05:00
CitadelStationBot
a317d23a51
[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie ( #916 )
...
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie
* fixes .rej
2017-05-18 09:37:30 -05:00
CitadelStationBot
423ce5ffbd
[MIRROR] Canisters only notify admins if they contain a meaningful amount of dangerous gas when opened ( #901 )
...
* Canisters only notify admins if they contain a meaningful amount of dangerous gas when opened
* Update canister.dm
* Delete canister.dm.rej
2017-05-18 07:55:27 -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
f978e3d56e
rej cleanup
2017-05-17 03:50:34 -05:00
LetterJay
42d354f9c8
cryo pod icon fix
2017-05-16 15:27:30 -05:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
LetterJay
22aef374e2
Merge branch 'master' into upstream-merge-26140
2017-05-13 01:28:34 -04:00
LetterJay
f5e8a7e4e4
rej merges
2017-05-12 23:57:11 -05:00
CitadelStationBot
7f0f7e1cc6
Cleans up meter's Initialize ( #905 )
2017-05-11 18:24:00 -07:00
CitadelStationBot
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
CitadelStationBot
cc0a9b87fb
Changes /obj/machinery to have atom/movable occupants
2017-05-01 15:58:52 -05:00
CitadelStationBot
724082121c
[FUN REMOVAL] Makes fire not able to become ice.
2017-04-30 12:23:29 -05:00
CitadelStationBot
caaf42815a
Changes some << to to_chat
2017-04-28 06:14:47 -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
LetterJay
a8c4c86e1c
REJ CLEANUP!
2017-04-26 06:48:41 -05:00
LetterJay
8b31b86e0f
manual merge
2017-04-26 06:38:01 -05:00
CitadelStationBot
45e9b1644e
Gas injectors are now buildable
2017-04-26 04:35:40 -05:00
CitadelStationBot
3afe339198
Fixes bugs with shuttles breaking pipes, wires and disposals
2017-04-24 17:43:37 -05:00
TalkingCactus
abd7f2b348
Cleans Up Rejected Mirror files ( #414 )
...
* bang
* updates tgstation.dme
* fixes missing stylesheet entries
* updates the map
includes backup map file
* removes ten billion runtimes
2017-04-15 17:55:53 -04:00
CitadelStationBot
09572935ca
[MIRROR] Fixes plasmamen burning to death in cloning pods ( #382 )
...
* Fixes plasmamen burning to death in cloning pods
* fix travis
2017-04-15 14:36:59 -04:00
CitadelStationBot
773ff04310
hotfix for immutable mixtures ( #368 )
2017-04-15 03:48:26 -04:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
