shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,271 Commits 5 Branches 0 Tags
d9a7e860dd4e3cd89eb66fa0a2edf135e65283f1
Commit Graph

2085 Commits

Author SHA1 Message Date
Lin
955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy 
policy configuration & support hooks for clone memory disorder
 2020-07-11 16:40:38 -05:00
silicons
4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact 
port examines and eye contact
 2020-07-11 00:14:47 -07:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01:00
Putnam
9b955e5d03 gotta replace all of them actually 2020-07-09 03:19:52 -07:00
Putnam
7cf4a55496 at least it'll fail better this time 2020-07-09 02:18:08 -07:00
Putnam
196261296e probably fixes travis 2020-07-09 01:40:39 -07:00
Putnam
aefdf9eef7 duplicate REVERSE_DIR 2020-07-09 01:38:17 -07: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
Lin
33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833 
mowing down experimental cloner copypasta.
 2020-07-07 13:23:25 -05:00
Ghom
e7d19f512e Merge pull request #12397 from Rohesie/cooldown 
Ports TGMC timer cooldowns
 2020-07-06 22:54:58 +02:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Lin
d04b335d1a Merge pull request #12652 from silicons/cool 
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
 2020-07-04 14:12:43 -05:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
silicons
cbad654371 Merge pull request #12632 from Ghommie/Ghommie-cit823 
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
 2020-07-02 01:44:09 -07:00
silicons
e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07:00
silicons
3b3a3ad44e nayser 2020-06-29 23:37:51 -07:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 
More and more fixes.
 2020-06-29 14:18:10 -07:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
silicons
7b101a801c Update configuration.dm 2020-06-29 04:55:22 -07:00
Ghommie
5307676317 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-29 06:55:35 +02:00
Ghommie
2f5d351d70 Just ups stamina cost for bashing people. 2020-06-28 18:47:55 +02:00
Ghommie
6e90560173 Nerfs natural stamina recovery outside of stam-crit. 2020-06-28 02:40:16 +02:00
silicons
5c10370326 Merge pull request #12601 from Detective-Google/piggyback 
piggyback carrying people is no longer comically slow
 2020-06-27 14:54:44 -07:00
silicons
45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819 
Porting further material datum features and improvements.
 2020-06-27 14:53:28 -07:00
L
3aefc8ae10 tg changes 2020-06-27 07:01:19 -03:00
silicons
0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
Detective Google
a4c243331c aeugh 2020-06-24 17:25:39 -05:00
Detective Google
e061f7f7ea piggyback carrying people is no longer comically slow 2020-06-24 17:10:41 -05:00
Ghommie
fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Lin
2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
Timothy Teakettle
2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
kevinz000
eb572c9d47 Merge pull request #12537 from timothyteakettle/ports-tipping-medibots 
ports tipping medbots from tg
 2020-06-17 08:35:50 -07:00
kevinz000
2e943e03a3 Merge pull request #12544 from SmArtKar/bee_shuttles 
Shuttles from beestation
 2020-06-17 08:35:34 -07:00
SmArtKar
46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Timothy Teakettle
eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Lin
fd662047f3 Merge pull request #12518 from kevinz000/pp_fix 
refactors projectile ricochet and fixes a runtime with projectile motion
 2020-06-15 13:59:41 -05:00
Ghom
7513e032e3 petrification improvements (#12375) 
* petrification improvements

* Standards.
 2020-06-14 23:04:12 -07:00
Ghommie
02a21081a6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-15 02:21:21 +02:00
Lin
47adbd3e90 Merge pull request #12516 from kevinz000/vv_fix 
Fixes VV not allowing proper access to datums in associative lists. Upgrades SDQL2 printout for the 3rd? 4th? 5th? time
 2020-06-14 14:54:29 -05:00
Timothy Teakettle
1c2366cc3d update files to tgs 2020-06-14 18:16:01 +01:00