shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,186 Commits 5 Branches 0 Tags
d13d76ad71d51be528b2ecbf7113ffd6f4da53cd
Commit Graph

517 Commits

Author SHA1 Message Date
LetterJay b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
LetterJay f786a90bad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 
# Conflicts:
#	code/controllers/subsystem/idlenpcpool.dm
 2018-01-02 04:37:36 -06:00
LetterJay c9482653f1 Merge pull request #4395 from Citadel-Station-13/upstream-merge-33537 
[MIRROR] Defines all subsystem priority values
 2018-01-02 04:21:05 -06:00
LetterJay 9ede14fbce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 2018-01-01 14:14:06 -06:00
LetterJay 168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
oranges 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
LetterJay c8f3fdfe38 Merge branch 'master' into upstream-merge-33663 2017-12-30 13:29:36 -06:00
LetterJay dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
LetterJay b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
LetterJay d3f6cf4dd8 Merge branch 'master' into upstream-merge-33537 2017-12-30 13:14:48 -06:00
LetterJay a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
LetterJay c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
XDTM d8943d6a1e [Ready]Adds the Pax reagent, small tweaks to pacifism 2017-12-29 02:37:58 -06:00
LetterJay 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
oranges 269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay 2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
LetterJay e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
LetterJay 290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
Emmett Gaines 9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
LetterJay ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan Brown 164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
Jordan Brown 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
kevinz000 a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
LetterJay 74232f6373 Merge pull request #4480 from Citadel-Station-13/upstream-merge-33550 
[MIRROR] Adds instanceless component dupe mode
 2017-12-21 04:58:20 -06:00
LetterJay 8ea38cfde2 Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681 
[MIRROR] Immovable rod abuse, smite and event trigger.
 2017-12-21 04:55:32 -06:00
LetterJay 3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
LetterJay 56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
Jordan Brown 09c802f984 Merge pull request #33550 from ninjanomnom/instanceless-component-dupe 
Adds instanceless component dupe mode
 2017-12-21 00:51:02 -06:00
AnturK 6c4d687db6 Immovable rod abuse, smite and event trigger. (#33681) 2017-12-21 00:11:20 -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
deathride58 17dda62a93 Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622 
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-21 03:28:14 +00:00
LetterJay 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Jordan Brown 25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
oranges d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
LetterJay 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay a98178251d Merge pull request #4444 from Citadel-Station-13/upstream-merge-33531 
[MIRROR] [READY]Cyborg jousting with spears!
 2017-12-19 17:31:26 -06:00
deathride58 d39b0204fa Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307 
[MIRROR] Adds config inclusion system
 2017-12-19 19:49:32 +00:00
duncathan salt 0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
ACCount 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
Emmett Gaines 8cf30a65fb dock() re-organization 2017-12-18 21:23:58 -06:00
kevinz000 8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -06:00
XDTM 6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
LetterJay 76e6cb4e48 Update server_tools.dm 2017-12-18 17:31:07 -06:00
LetterJay 9ccdb75e57 Update stat.dm 2017-12-18 17:23:52 -06:00
LetterJay 390c24b3fd Create server_tools.config.dm 2017-12-18 16:42:17 -06:00
LetterJay a85f5eea6b Update server_tools.dm 2017-12-18 15:23:55 -06:00
XDTM 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
vuonojenmustaturska 8cbad06f35 Advanced mob laziness 2017-12-17 19:36:04 -06:00
LetterJay 99a173b187 Update stat.dm 2017-12-17 15:54:52 -06:00
XDTM 962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00