LetterJay
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
deathride58
b2187123fb
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
...
[MIRROR] [Ready]Brain Trauma additions
2017-12-21 03:42:38 +00:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
LetterJay
eb9260c8bf
Update implantcase.dm
2017-12-17 17:38:09 -06:00
XDTM
962f135957
[Ready]Brain Trauma additions
2017-12-17 11:11:10 -06:00
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
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
deathride58
08af4665b4
Update implant.dm
2017-12-13 16:45:54 -05: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
6a8cffc3d5
Update implantuplink.dm
2017-12-10 18:03:04 -05:00
oranges
d88bff9fa9
Restores the uplink modules, removes LoadComponents
2017-12-10 14:14:37 -06:00
deathride58
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00
Leo
97c04d1430
Merge pull request #33262 from AutomaticFrenzy/patch/uplink-implant
...
Fix uplink implants not working
2017-12-05 15:39:25 -06:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
deathride58
738c1b7b2a
Update implantuplink.dm
2017-11-22 17:57:43 -05:00
oranges
cec6c028f5
[READY]Refactors uplinks to a component!
2017-11-22 15:17:03 -06:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
AnturK
2ecb4c216c
Datum rev & related upgrades to base datum antag
2017-10-18 02:26:11 -05:00
oranges
5c49bab3c5
Merge pull request #31135 from KorPhaeron/unconvertable
...
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
pubby
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
MoreRobustThanYou
df607bb24c
Implant Chairs now also support organs ( #30982 )
...
* Implant Chairs now also support organs
* Update implantchair.dm
* Update implantchair.dm
2017-09-24 11:55:22 -05:00
Robustin
894673ef97
Fixes revolutionary deconversion messages and logging
2017-09-23 11:07:05 -05:00
CitadelStationBot
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
c42304737a
Update implantchair.dm
2017-09-11 17:47:55 -05:00
LetterJay
c03e216016
Update implantchair.dm
2017-09-11 14:05:58 -05:00
kingofkosmos
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
CitadelStationBot
bdf2fff8d9
Adds logging cause of microbomb activation in admin logs
2017-08-28 02:19:59 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
