3dc89ba058
Antag Panel / Check antagonists Refactor
2018-01-19 08:43:49 -06:00
145cc8a822
Makes cyborg module damage visible to anyone nearby ( #34287 )
...
* swaps to_chats with visilbe_messages in damage feedback
* adds an actual alarm sound
2018-01-11 21:32:24 -06:00
6957a6f13f
Merge branch 'master' into upstream-merge-34105
2018-01-08 20:03:41 +00:00
1e9598dfbd
Clean up a bunch of undefined arg runtimes
2018-01-07 20:53:12 -06:00
66f0a9c2b7
mob living silicon
2018-01-04 01:06:25 -05:00
3208404f14
Merge pull request #33580 from Xhuis/defenses_balancing
...
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -06:00
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
3df98e631b
Fixes compiling errors
2017-12-28 16:13:30 -05:00
2fdb9e598f
Modularizes dogborgs, adds new alternate skins for some modules, and more!
2017-12-28 15:50:33 -05:00
5dd7136225
Merge branch 'master' into upstream-merge-33590
2017-12-25 21:29:18 -06:00
af1f13e114
Merge pull request #33306 from coiax/replace-clean-flag-with-component
...
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
2017-12-23 08:36:37 -06:00
bec20087c2
[READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-22 10:58:13 -06:00
529e839203
dog borgs module icon fix
2017-12-21 13:46:44 -06:00
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
129cd705d1
Correctly set description of nonstandard cells
2017-12-13 09:12:55 -06:00
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
40cf3ab656
Update robot_movement.dm
2017-12-04 16:22:24 -05:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
15165d970d
Update inventory.dm
2017-11-20 22:29:55 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
591efe27a3
Update robot_modules.dm
2017-11-18 00:19:35 -05:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
9c12ee48e1
Adds an organ storage bag to the syndicate medborg ( #32437 )
...
* Adds an organ storage bag to the syndicate medborg
* Adds the drill and extinguisher
2017-11-06 15:15:10 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
a664384e81
Bhijn's touching dogborg balance again everyone panic ( #3432 )
...
* rebuffs everything and puts babyproof locks on scrubpup compactor
* lets it compile, removes things from the blacklist
* readds telegraphing due to popular vote, removes flash from scrubpups
* does githubs text editor work for basic thing on mobile
* reverts blacklist changes
* keeps spoolup, removes sounds + anime prepounce effects
2017-10-24 22:04:51 -05:00
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
7b8e88ec7e
Medihound Fixes ( #3462 )
...
* fix borgs, tries new things
* TGUI experiment, Expanded resist
also cleans up some bad code we don't want to keep
* kinda important to have the right one
* I actually managed to compile tgui
* tgui fuckery
I hate UI building
* more tgui tweaks
and it finally compiles, again.
* Have I mentioned UIs are not my strong point?
Because they're really not
* updates to this shit thing.
Tgui button chem selection -> chem to inject needs to be fixed
* No.
* FUCKING, FINALLY
2017-10-21 06:15:50 -05:00
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
5ad2b5d866
Merge pull request #31830 from ShizCalev/geiger-borg
...
Gives engi borgs geiger counters
2017-10-18 07:24:53 -05:00
47195cdbf0
INTENSE BORGO BALANCE TWEAKS
2017-10-15 00:30:22 -04:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
033d14e8b3
loc -- > forcemove
2017-10-12 06:13:11 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
d701230090
Merge pull request #31114 from AnturK/spacevision
...
Fixes space vision
2017-10-01 15:15:54 -05:00
747312cb6d
updates
2017-10-01 00:59:59 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
2d48a0cf50
[MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. ( #2967 )
...
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
2017-09-28 05:59:57 -07:00
4f85246e42
Update robot_modules.dm
2017-09-27 18:42:06 -05:00
AnturK