Commit Graph

115 Commits

Author SHA1 Message Date
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -07:00
silicons
a41e1b1077 Update ninjaDrainAct.dm 2020-12-18 05:00:16 -07:00
silicons
029c755e15 Update ninjaDrainAct.dm 2020-12-16 02:49:37 -07:00
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
33d5ba788b aight 2020-07-24 20:19:18 -07:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Akrilla
5c74e239a0 wew 2020-04-10 03:43:18 +01:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676)
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
Ghommie
f7ce5e5de3 infiltrator sneaky shoes fix. 2020-03-27 14:42:23 +01:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie
2553384c6e Shortcut fix for a sticky situation. 2020-03-16 01:23:12 +01:00
Lin
1a36d6e6fa Merge pull request #10770 from Ghommie/Ghommie-cit536
Removes an unused file and another outdated one.
2020-03-07 17:59:12 -06:00
Lin
3dfd7a5ea4 Merge pull request #11356 from Citadel-Station-13/kevinz000-patch-19
Nerfs ninja stungloves to match new batons
2020-03-07 17:50:54 -06:00
kevinz000
5aacdded63 Update gloves.dm 2020-03-06 06:23:56 -07:00
kevinz000
2f83492451 Update ninjaDrainAct.dm 2020-03-06 06:23:13 -07:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
Kraseo
e5e05d5d61 handles cases where stripping plasmamen would not give them what they need to not die 2020-03-02 11:47:44 +01:00
Ghommie
da90b67d07 Removes an unused file and outdated procs. 2020-01-29 06:01:23 +01:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
ccd966ed28 Update, fix. 2019-12-04 20:32:25 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie
76294cf162 oh flak. 2019-11-03 17:29:53 +01:00
Ghommie
286b78c84c Minor ninja tweaks and stealth nerf. 2019-11-03 17:14:55 +01:00
Ghommie
abb8450e29 ninja shoes. 2019-09-18 04:07:51 +02:00
Ghommie
63a2867ff6 slot check aaaaaaaaah. 2019-07-28 01:31:01 +02:00
Ghommie
78e4c8689b reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code. 2019-07-28 01:04:19 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Ghommie
3404131f3a don't init yet. 2019-07-07 05:19:13 +02:00
Ghommie
696dd2839b clunky. 2019-07-07 05:13:14 +02:00
Ghommie
b2192f0530 Fixes up space ninja's energy net. 2019-07-07 05:06:03 +02:00
Useroth
ec1ff9ada3 The joy of making an error in a webedit. 2019-06-14 13:05:36 +02:00
Useroth
bd35b8696c Another commit to get fucking Travis going. 2019-06-14 12:52:03 +02:00
Useroth
3f4d9319e9 Update energy_net_nets.dm 2019-06-13 20:38:22 +02:00
Useroth
e3acef755a Fuck you again, Travis. Do it right this time. 2019-06-13 20:33:45 +02:00
Useroth
bab2ec4789 Travis, I fucking mean it. Compile it. 2019-06-13 15:46:12 +02:00
Useroth
5e90c530e0 Travis, you whore, compile it properly. 2019-06-13 15:37:18 +02:00
Useroth
2d977becb5 Finally fixed the net breaking mechanics. 2019-06-13 15:27:57 +02:00
Useroth
39bedb8341 Update ninjaDrainAct.dm 2019-06-13 15:27:56 +02:00
Useroth
ee661d1eb8 An afterthought regarding healing/reviving the capturees. 2019-06-13 15:27:56 +02:00