shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

3910 Commits

Author SHA1 Message Date
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
Thalpy 696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01: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
Thalpy a2a5bbdb11 Found the "the floor" message admin! 2019-06-26 19:40:46 +01:00
Sishen 65d05f7df0 Goodbye golem AI 2019-06-26 00:08:42 -04:00
kevinz000 67312abf04 Update life.dm 2019-06-25 01:37:51 -07:00
kevinz000 b45a789b54 Update life.dm 2019-06-25 01:35:56 -07:00
Ghommie 31b5f2a458 ports "Stockings" 2019-06-24 07:30:13 +02:00
Fermi 10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01: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
TrilbySpaseClone 771ac9724e ports Fel connet 
Shamelessly stealing content
 2019-06-21 04:39:10 -04: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
Fermi 713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +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
Fermi 38ed75dc68 Reverts sneaky pandas 2019-06-18 22:48:34 +01:00
Ghommie d9d4a88a0b *Dramatic low-pitch scenic sound plays in* 2019-06-18 21:59:05 +02:00
Fermi ade3a4bced Fixes. 2019-06-18 19:06:26 +01:00
Fermi d2a5e9ddfd Makeup panda 2019-06-18 18:51:30 +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
Fermi 4526832e7d I'm spending too much time trying to fix something rejected. 2019-06-17 15:16:45 +01:00