shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

96 Commits

Author SHA1 Message Date
Timothy Teakettle
db87297536 fix (#13632) 2020-11-01 22:03:43 +01:00
Hatterhat
9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
BlackMajor
63b1bfd45c Merge pull request #13303 from Citadel-Station-13/silicons-patch-27 
combat defibs now hit for disarm + 35 stamina (old stunbaton values) instead of disarm + 75 stamina
 2020-09-06 18:03:59 +12:00
GrayRachnid
1234b51e82 Revert "Buffs defib users by making them stop pulling automatically" 2020-08-30 00:24:31 -04:00
silicons
bbb5c076c5 Update defib.dm 2020-08-29 20:05:55 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
silicons
e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07:00
silicons
1d4a54d880 log 2020-06-26 23:47:16 -07:00
silicons
0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000
92e95f816a Update defib.dm 2020-03-02 03:49:21 -07:00
Ghom
a99e9ec2ff Ok 2020-02-27 02:15:03 +01:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01: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
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Artur
a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Ghommie
6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Lin
7794cea49c Merge pull request #9538 from Citadel-Station-13/kevinz000-patch-99 
Brings the combat back in combat defibrillator (DOES NOT BUFF CMO DO NOT YELL AT ME)
 2019-12-09 04:33:23 +00:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Putnam3145
1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes 
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
 2019-11-30 22:51:42 -08:00
deathride58
b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00
Thalpy
00bffba7ea Why do surgeries always end up with jank 2019-11-21 15:57:21 +00:00
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
Ghommie
ba307b01a5 Defib fixes and chem effects stuff 2019-10-23 13:45:57 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
kevinz000
9c8356d9ea Update defib.dm 2019-10-19 20:48:55 -07:00
kevinz000
094fdbd271 Update defib.dm 2019-10-19 19:49:48 -07:00
Ghommie
e991328087 progress 2019-10-19 15:02:56 +02:00
Fermi
aabc2423a8 Oops. 2019-09-19 01:19:45 +01:00
Fermi
107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Ghommie
d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
CdrCross
82d308eb5e Defibrillator Upgrades Proofread 
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
 2019-05-21 23:37:28 +02:00
Poojawa
eb717645bd M.emote("scream") 2019-05-17 05:16:53 -05:00
Poojawa
751166cfbe Unfucks borg defibs 2019-05-17 04:59:53 -05:00
Poojawa
3304875e38 Buffs defib users by making them stop pulling automatically 2019-04-11 14:36:41 -05:00
Trilbyspaceclone
09c6abd19c maybe 2019-03-27 15:19:47 -04:00