shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,561 Commits 5 Branches 0 Tags
8d9832938fa451a1f5609bb06a3ac83c8bbda9cc
Commit Graph

2482 Commits

Author SHA1 Message Date
kevinz000
05f304f9c0 Merge pull request #8692 from Ghommie/Ghommie-cit69 
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
 2019-06-23 06:56:17 -07:00
kevinz000
dcab96d9d5 Merge pull request #8721 from Ghommie/Ghommie-cit77 
Ports in "Liver removal/failure now also stops passive reagent effects"
 2019-06-23 06:53:30 -07:00
kevinz000
294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57 
ports "Componentizes orbiting"
 2019-06-23 06:50:32 -07:00
kevinz000
46140e16ec Merge pull request #8689 from Thalpy/Pandas 
Add Red Panda simplemobs.
 2019-06-23 06:46:32 -07:00
kevinz000
9db94f7c29 Merge pull request #8691 from Ghommie/Ghommie-cit68 
Ports in beekini and bee socks.
 2019-06-23 06:41:34 -07:00
BlackMajor
d6a31efaa2 Merge pull request #8684 from Citadel-Station-13/kevinz000-patch-5 
fixes piggybacking being delayless
 2019-06-24 01:31:40 +12:00
kevinz000
6f2fbd8577 Merge pull request #8677 from Trilbyspaceclone/patch-182 
buffs speedy step quirk by a half
 2019-06-23 06:20:58 -07:00
Ghom
41bd3caf3c Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669) 
* Ports "Reorganizes the uplink, adds grenades and explosives category."

* Unbent codex, singing the sorrow of aborted spoils.

* .
 2019-06-23 06:00:27 -07:00
Ghommie
45109776e1 Ports in "Liver removal/failure now also stops passive reagent effects" 2019-06-22 17:05:08 +02:00
Thalpy
498c35b733 Fixes empathy antag check exploit. (#8690) 
* Fixes exploit

* Wrong way round..!

* Should be okay for antags now.

* Fixed githuba being dumb
 2019-06-21 19:33:34 -07:00
Thalpy
3f10ad390b Update code/modules/mob/living/simple_animal/friendly/panda.dm 
Wah

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-06-20 02:15:55 +01:00
Ghommie
55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Ghommie
db3d5848c2 Ports in beekini and bee socks. 2019-06-19 01:28:47 +02:00
Fermi
699b78dd80 Red pandas! 2019-06-18 23:00:54 +01:00
kevinz000
634f11d60d Update human.dm 2019-06-18 02:34:05 -07:00
Trilbyspaceclone
4e1ac41393 Update species.dm 2019-06-17 14:41:06 -04:00
Poojawa
bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602) 
* Gentials layered under underclothes

* screm
 2019-06-17 11:20:25 -07:00
kevinz000
4f42d40681 Merge pull request #8507 from Thalpy/Wheelchairs 
Adds Hoverchairs and the paraplegic trait.
 2019-06-17 11:13:43 -07:00
deathride58
7b329ae824 Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline 
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
 2019-06-16 22:51:03 -04:00
deathride58
d0bc89353c Merge pull request #8597 from Citadel-Station-13/kevinz000-patch-48 
pacifists can now let people piggyback (grab_passive). admins now can proccall buckle_mob on humans in a way that bypasses piggyback code block
 2019-06-16 22:50:15 -04:00
kevinz000
27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170 
Ports origami skills for paper wiz loot
 2019-06-16 19:40:01 -07:00
Ghommie
b2d82bd1f1 Applying upstream fixes. 2019-06-17 00:27:07 +02:00
Ghommie
b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
Thalpy
98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
deathride58
fdc0e4f957 Merge pull request #8611 from Poojawa/digitigrade-socks 
Digitigrade socks
 2019-06-14 20:50:05 -04:00
deathride58
b1f1b2a57d Merge pull request #8609 from Poojawa/simple_mob_nomming-I-guess 
Client check to possibly fix #8542
 2019-06-14 20:49:28 -04:00
Poojawa
d8dbad6e2e Digitigrade socks 2019-06-10 04:47:07 -05:00
Poojawa
17629d4feb client check I guess 2019-06-10 03:28:56 -05:00
kevinz000
8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
Poojawa
3f1b7e4dd6 Pacifists can nom things now, but not feed to others 2019-06-09 02:23:53 -05:00
kevinz000
b534f57374 Update human.dm 2019-06-08 23:44:27 -07:00
kevinz000
1cf5e24b4d Update human.dm 2019-06-08 23:23:21 -07:00
kevinz000
88240ca06c Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 19:45:19 -07:00
kevinz000
ec9ae5348f Merge remote-tracking branch 'origin/master' into kevinz000-patch-48 2019-06-08 19:10:59 -07:00
kevinz000
752a5835df Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 18:31:37 -07:00
kevinz000
c3db9a3cd9 stuff 2019-06-08 18:22:37 -07:00
kevinz000
1a07f304c9 Update examine.dm 2019-06-08 17:32:36 -07:00
kevinz000
5cf0a9e67f Update carbon_defense.dm 2019-06-08 17:30:50 -07:00
Thalpy
628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
kevinz000
d28754cb4d Merge pull request #8560 from Ghommie/Ghommie-cit37 
Ports in the fix against hitting oneself with one's own thrown items.
 2019-06-08 01:27:43 -07:00
kevinz000
1488af1a52 Merge pull request #8554 from Ghommie/Ghommie-cit33 
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
 2019-06-08 01:24:59 -07:00
kevinz000
eb1c767ab7 Merge pull request #8553 from Poojawa/ghost-erp 
Clarifies a few things about subtler and how it should be used
 2019-06-08 01:24:36 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
kevinz000
9edac9fc6c Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss 
Rebalanced Ass Slapping
 2019-06-08 01:17:04 -07:00
kevinz000
61d0ac9993 Merge pull request #8476 from Trilbyspaceclone/patch-157 
Tweaks/Buffs hierophant
 2019-06-08 01:05:28 -07:00
deathride58
1dde6b90ae Merge pull request #8538 from dtfe3/dtfe3-hair-twintail 
Hair - Long Twintails
 2019-06-08 01:37:29 -04:00
deathride58
8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf 
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
 2019-06-08 01:07:56 -04:00
Trilbyspaceclone
79a456a0ac Update carbon_defense.dm 2019-06-07 18:29:42 -04:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie
56be73f7e0 Lord Travis Hath Spoken. 2019-06-07 07:44:33 +02:00