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

2513 Commits

Author SHA1 Message Date
BlackMajor fbc2d3c8fe Ports dogborg sprites from RP to main 
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
 2019-09-06 01:23:53 +12:00
kevinz000 748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight 
Ports traitor codeword highlighting
 2019-07-05 06:57:49 -07:00
kevinz000 7544748570 Merge pull request #8790 from deathride58/pryablesleepers 
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
 2019-07-05 06:55:18 -07:00
kevinz000 bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
kevinz000 75f1dca544 Merge pull request #8773 from Sishen1542/podgang 
Podweak now have all customization options.
 2019-07-03 13:46:08 -07:00
kevinz000 10a584c71f Merge pull request #8776 from Ghommie/Ghommie-cit96 
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
 2019-07-03 13:45:02 -07:00
Ghommie 1fd50cc15a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96 2019-07-03 04:52:57 +02:00
Ghommie 33687dc2bc I'm an idiot, I need to pick an element within the list, not the list itself!! 2019-07-01 22:53:42 +02:00
Ghommie d0a001f663 Quickfixing latejoin ghost roles, I'm sorry. 2019-07-01 22:47:51 +02:00
deathride58 4b83110db7 fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck. 2019-06-30 05:02:51 -04:00
deathride58 1efd1b2634 oh, and lets add a length check real quick to make sure the sleeper actually has shit in it 2019-06-30 04:35:34 -04:00
deathride58 cb5ed2d2cd Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar 2019-06-30 04:29:48 -04:00
kevinz000 09c8a45fe2 Merge pull request #8770 from Arturlang/Carp_Deflecting 
Carp now deflects the bullets instead of making them dissapear.
 2019-06-29 20:08:47 -07:00
Ghommie ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie 0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
kevinz000 c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain 
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
 2019-06-28 20:32:15 -07:00
Ghommie d93e63af53 we just want the trauma to be niche, not unachievable. 2019-06-28 23:21:10 +02:00
Ghommie 3291b9c47a Porting in donut fixes, beepsky smash and Neurotoxin reworks. 2019-06-28 23:17:12 +02:00
deathride58 7e943c0f42 Merge pull request #8737 from Ghommie/Ghommie-cit85 
Fixes CWC construct shells being visible as ghost role to latejoiners.
 2019-06-28 16:03:53 -04:00
Sishen 1459ada045 adds customization options for podweak 2019-06-28 10:22:09 -04:00
Arturlang 442c21fdba For the actual deflecting! 2019-06-28 11:41:01 +03:00
deathride58 3cd5b1d180 Merge pull request #8741 from Ghommie/Ghommie-cit88 
ports "Stockings"
 2019-06-28 00:38:27 -04:00
deathride58 2ed69c8b46 Merge pull request #8753 from Sishen1542/siliconmanbad 
[PORT] Non-station AI can no longer interact off their z-level.
 2019-06-28 00:29:32 -04:00
Ghommie a90ef6faa3 and it's gone. 2019-06-27 15:06:04 +02:00
Ghommie d7028b0059 Fixes "Bubbles ate my Cohiba Robusto!" 2019-06-27 05:32:08 +02:00
Sishen 65d05f7df0 Goodbye golem AI 2019-06-26 00:08:42 -04:00
Ghommie 31b5f2a458 ports "Stockings" 2019-06-24 07:30:13 +02:00
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
Sishen a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
Ghommie b168a8c294 Fixes CWC construct shells being visible as ghost role to latejoiners. 2019-06-23 08:03:56 +02: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