Commit Graph

593 Commits

Author SHA1 Message Date
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
Lin
e143b69aa6 Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes
removing vog's ability to commit sin, probably
2020-07-13 11:31:25 -05:00
Hatterhat
eb0e0b6cbd i may not test my shit but at least i can have less line changes motherfucker 2020-07-11 23:18:17 -05:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
silicons
f03343b516 fix 2020-06-30 05:19:50 -07:00
silicons
7a2818d657 fix 2020-06-29 23:45:18 -07:00
silicons
6a91ce8416 fix 2020-06-29 23:43:53 -07:00
silicons
3b3a3ad44e nayser 2020-06-29 23:37:51 -07:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
50171db408 Makes fermichem properly logged in the reagents logs, tiny astrogen fix. 2020-05-21 03:04:26 +02:00
Putnam
8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
kevinz000
395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
Putnam
f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-11 17:10:55 -07:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghommie
667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie
592198d659 Makes privates not spew around upon disembowelment or gibbing. 2020-05-02 20:01:54 +02:00
Ghommie
3715f95650 Stops organs from turning against you in cold environments and freezers. 2020-05-01 16:56:33 +02:00
Putnam
2c6ef2f5d1 fix appendices instakilling everyone 2020-04-28 22:14:32 -07:00
Lin
19f89ed1ba Merge pull request #12022 from Ghommie/Ghommie-cit711
organ/on_life tweaks.
2020-04-29 01:15:02 +00:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Ghommie
8440b48a9a organ/on_life tweaks. 2020-04-25 16:19:43 +02:00
Ghom
5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness
Cybernetic arm implant balance pass (namely: shields)
2020-04-25 02:47:28 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000
e4e2c0195c epic 2020-04-22 12:04:47 -07:00
kevinz000
c551006295 catch dropped 2020-04-22 10:54:42 -07:00
kevinz000
467497af54 woops 2020-04-22 10:45:13 -07:00
kevinz000
3e09ee8328 Alright 2020-04-22 10:42:11 -07:00
Putnam
5df4287c8d Fixes a runtime in livers. 2020-04-20 11:10:43 -07:00
kevinz000
6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
Ghommie
31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
Ghommie
af55880794 Fixes and standarizes a few liver troubles. Re-enables liver failure. 2020-04-10 17:22:34 +02:00
Ghommie
2103e9975b Oh yea, also a fix. 2020-03-21 02:37:05 +01:00
Ghommie
26e2ec92ca Removes species default_features variable. 2020-03-21 02:04:57 +01:00
Ghommie
5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghom
5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants
3 new arm tool set implants
2020-03-06 01:25:02 +01:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie
c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
kevinz000
4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
Makes all IPC organs look robotic!
2020-02-24 02:24:06 -07:00
kevinz000
493d62c17e Merge pull request #11184 from Trilbyspaceclone/patch-292
Remember when Kev made IPCs hearts no longer emp? Me ether!
2020-02-24 02:23:45 -07:00
TrilbySpaceClone
c638a83e23 Merge branch 'master' into more_implants 2020-02-22 18:34:02 -05:00
Trilbyspaceclone
18bfde5a0a Update augments_arms.dm 2020-02-22 17:58:50 -05:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00