shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,746 Commits 5 Branches 0 Tags
ba307b01a5d08e2caf4a95fb41c225cf98cfbc3d
Commit Graph

1234 Commits

Author SHA1 Message Date
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
kevinz000
1d649c27de Update robot_movement.dm 2019-10-21 14:38:38 -07:00
kevinz000
9e63413911 Merge pull request #9466 from deathride58/yawnborgs 
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
 2019-10-21 01:04:34 -07:00
kevinz000
838575da50 Merge pull request #9503 from deathride58/tasernerf 
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
 2019-10-21 00:59:58 -07:00
kevinz000
c59f15a8bc Merge pull request #9529 from BlackMajor/Yeet 
Syndicate paper masks no longer work in pockets
 2019-10-19 19:53:40 -07:00
BlackMajor
d39897b9ad Update phantomthief.dm 2019-10-18 23:34:31 +13:00
kevinz000
5e049bc64a Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish 
foot fetish content for kevin (ankle coverings)
 2019-10-17 12:49:08 -07:00
kevinz000
a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements 
Vore fixes and optimizations
 2019-10-17 12:48:01 -07:00
Linzolle
1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
BlackMajor
e8649e5c3c Merge pull request #9506 from izzyinbox/bark 
Adds *bark emote
 2019-10-16 21:00:15 +13:00
kevinz000
11a93d41de Merge pull request #9499 from r4d6/patch-1 
Add a Blindfold to the loadout list
 2019-10-15 22:57:02 -07:00
izzyinbox
7a91bb4cd3 Adds *bark emote 2019-10-15 10:24:08 -05:00
deathride58
9fd4e7f673 Merge pull request #9472 from Thalpy/Quickfixforfood 
[speedmerge] Quickfixforfood and fixes the chem hindenburg
 2019-10-15 06:32:59 -04:00
deathride58
26d4a2d943 Merge pull request #9493 from Ghommie/Ghommie-cit234 
SDGF ghost poll message made terse, other tweaks.
 2019-10-15 06:27:58 -04:00
Poojawa
d5d878e93e moved the values up 2019-10-15 04:09:46 -05:00
Poojawa
ff21b992ad Move files and tweaks vore panel stuff 2019-10-15 03:35:00 -05:00
deathride58
50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
r4d6
a824998b89 Add a Blindfold to the loadout list 2019-10-14 11:48:14 -04:00
Ghommie
321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie
3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Jay
02b78a2817 changes donator item from glasses to a hat 2019-10-13 17:47:11 -05:00
Thalpy
06599523a9 Ghommie is a saint 2019-10-13 22:06:57 +01:00
Thalpy
3b8ea30d9b I did it 2019-10-12 20:06:46 +01:00
Thalpy
f6796b93b3 Fixes graft 2019-10-12 18:22:48 +01:00
Fermi
2e03985696 aaaa 2019-10-12 07:55:19 +01:00
kevinz000
a9dcf681ce Merge pull request #9457 from Ghommie/Ghommie-cit227 
Fixing a runtime when examining unloaded cit hyposprays.
 2019-10-11 12:16:50 -07:00
kevinz000
2e74833e72 Merge pull request #9444 from Thalpy/Updates-holder 
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
 2019-10-11 12:08:12 -07:00
deathride58
60749f8b07 Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert) 2019-10-11 14:33:32 -04:00
Ghommie
26e6ba9686 Fixing a runtime when examining unloaded cit hyposprays. 2019-10-09 18:34:54 +02:00
Fermi
ad0f34cdf8 Tweaks wiki a lil 2019-10-09 06:04:06 +01:00
Ghommie
735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Fermi
bc118d5ead Merge branch 'master' into Updates-holder 2019-10-08 12:21:56 +01:00
Fermi
b8c87a5f40 Spicy 2019-10-08 12:05:06 +01:00
kevinz000
922e9849bd Merge pull request #9391 from GrayRachnid/rebalancesk9borgs 
Rebalances k9borg pounce/bite around the secborg's baton.
 2019-10-08 00:36:26 -07:00
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
nik707
6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes 
Fixes the Trek uniform/suit sprites
 2019-10-07 18:19:59 -05:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie
cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
kevinz000
356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE 
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
 2019-10-05 08:26:40 -07:00
Fermi
2abd15c7e7 Incase someone speedmerges 2019-10-04 04:48:34 +01:00
GrayRachnid
7d579e6a0f Removed cell charge on bite. 2019-10-03 23:33:38 -04:00
GrayRachnid
211e7a2c60 removes charge from small jaws. Reduces big jaws charge to 250. Adds a thingy so they don't run out. removes misleading comments. 2019-10-03 23:05:38 -04:00
Fermi
d1c381cad3 lye down 2019-10-04 03:27:30 +01:00
Fermi
10f5fc3b47 Buffer fix 2019-10-04 03:22:53 +01:00
Jay
70cbd8c1ca fixes bad icon path 2019-10-02 22:11:42 -05:00
GrayRachnid
ad9ddcb6da Reduces cell charge to 750, spoolup time to 1 and reduces self-stun if missed. 2019-10-02 19:30:23 -04:00
GrayRachnid
e24c2ac249 Rebalances dogborg pounce/bite around the secborg's harmbaton. 2019-10-02 14:56:32 -04:00
Chayse Ramsay
68ca8a5ac0 whoops 2019-10-02 11:55:38 +01:00