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

8496 Commits

Author SHA1 Message Date
Fermi
7c19f5e0fa Forgot to comment out hypnoquirk. 2019-06-23 13:06:45 +01:00
Fermi
537161dd01 Lil flavour tweaks. 2019-06-23 03:22:54 +01:00
Fermi
21c17813b8 Guess who should've compile tested! 2019-06-23 01:20:11 +01:00
Fermi
59b6d85c4e Few phrasing and span editing fixes. 2019-06-22 21:59:20 +01:00
Fermi
f096e8440a Finally fixed the vocalchord button 2019-06-22 21:00:20 +01:00
Fermi
1f5a7c0a25 Added velvet styling 2019-06-22 13:31:55 +01:00
Fermi
226dbe7804 Fixed blank sprite for velvet chord organ 2019-06-22 13:09:18 +01:00
Fermi
d2685be3f6 Split custom echo code into it's own call to reduce overhead. 2019-06-22 12:18:38 +01:00
Fermi
35cc690f91 One more sneaky multiplier! 2019-06-20 02:16:53 +01:00
Fermi
b51f902c14 I can't spell 2019-06-20 02:13:36 +01:00
Fermi
1cefd6fca7 Added a few more comments for reviewers as I was reviewing myself. 2019-06-19 23:04:08 +01:00
Fermi
713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
Fermi
38ed75dc68 Reverts sneaky pandas 2019-06-18 22:48:34 +01:00
Fermi
ade3a4bced Fixes. 2019-06-18 19:06:26 +01:00
Fermi
d2a5e9ddfd Makeup panda 2019-06-18 18:51:30 +01:00
Poojawa
bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602) 
* Gentials layered under underclothes

* screm
 2019-06-17 11:20:25 -07:00
Ghom
95dc8084f1 Moving some tablecrafting recipes to the appropriate categories (#8658) 
* Moving some recipes to the appropriate categories

* Fixes the not-a-sandwich recipe being M.I.A.
 2019-06-17 11:18:49 -07:00
Ghom
d60a360e90 Ports "Removes firebug from goonchat" (#8650) 
* Ports "Removes firebug from goonchat"

* fucking acient goonchat pre-sync stuff.
 2019-06-17 11:17:38 -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
Fermi
d092dd1da0 Testing hypnoquirk 2019-06-17 12:47:23 +01:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Fermi
02de745519 Merge branch 'Wheelchairs' of https://github.com/Thalpy/Citadel-Station-13 into Wheelchairs 2019-06-17 12:02:56 +01:00
Fermi
2681a8f7a9 Updates has_trait to HAS_TRAIT 2019-06-17 12:02:39 +01:00
deathride58
c6f3bd1fd1 Merge pull request #8575 from Citadel-Station-13/kevinz000-patch-41 
nerfs disablers 3 --> 3.5 ds cooldown
 2019-06-16 22:53:10 -04:00
deathride58
b487b0103b Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes 
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
 2019-06-16 22:52:47 -04: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
78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172 
Organ Storage box
 2019-06-16 19:43:10 -07:00
kevinz000
27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors 
Adds Clockwork Reflectors
 2019-06-16 19:41:57 -07: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
kevinz000
b6aef75eed Merge pull request #8652 from Ghommie/Ghommie-cit53 
Ports "areas_in_z after start population fix"
 2019-06-16 19:35:55 -07:00
kevinz000
430bc7f43f Merge pull request #8643 from Ghommie/Ghommie-cit48 
Fixes the sacrificial target icon not displaying on the cult objective alert.
 2019-06-16 19:35:28 -07:00
kevinz000
67a00c9141 Merge pull request #8614 from Ghommie/Ghommie-cit44 
Portin "Fix chem dispensers starting with an extra power cell"
 2019-06-16 19:31:08 -07:00
kevinz000
9e85eb5757 Merge pull request #8618 from Trilbyspaceclone/Magless 
Corrects ammo boxes spawning, as well as buffs cargo shotgun crates
 2019-06-16 19:29:04 -07:00
Thalpy
98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
Fermi
2df7e208b5 Spellchecking. 2019-06-16 12:34:37 +01:00
Fermi
3caadb2009 pH calc redo, too confusing. 2019-06-16 12:22:13 +01:00
Fermi
8fb3022624 Classic me. 2019-06-16 10:25:43 +01:00
kevinz000
6149a44408 Merge pull request #8565 from SkullyRoberts/NudityPermit 
Ported the nudity permit from RP and made it a loadout option. You're welcome, Everoth
 2019-06-16 01:19:51 -07:00
kevinz000
1408a453de Merge pull request #8591 from Ghommie/Ghommie-cit43 
You smell that? Napalm, son.
 2019-06-16 01:16:12 -07:00
kevinz000
12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174 
Adds medical breifcases
 2019-06-16 01:11:11 -07:00
kevinz000
5d8286f91c Merge pull request #8640 from Trilbyspaceclone/more_cooking1 
Makes baklava pie
 2019-06-16 01:10:47 -07:00
kevinz000
8e10286fd6 Merge pull request #8484 from BlackMajor/Dunga 
Adds bluespace compression kit and superglue
 2019-06-16 01:10:25 -07:00
kevinz000
c6bdb74c6a Merge pull request #8623 from Arturlang/RD_ROD_SUPLEX 
RD can now suplex a immovable rod.
 2019-06-16 01:08:48 -07:00
kevinz000
3f39e5a8bc Merge pull request #8598 from Poojawa/patch-1 
Fixes Gulag point rewards upon inserting sheets
 2019-06-16 01:08:17 -07:00
kevinz000
4135bcfa77 Merge pull request #8639 from Useroth/ninja-shit 
Ninja tweaks and improvements. Take two.
 2019-06-16 01:03:34 -07:00
kevinz000
d3555d6782 Merge pull request #8243 from Trilbyspaceclone/meteor 
More Meteor defenses
 2019-06-16 01:01:43 -07:00
Ghommie
b5e3da68bd Ports "areas_in_z after start population fix" 2019-06-16 08:45:37 +02:00
deathride58
88a8db87c2 Merge pull request #8612 from BlackMajor/Ooga 
Makes a small adjustment to the ash walker camp.
 2019-06-15 21:29:55 -04:00