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

8466 Commits

Author SHA1 Message Date
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
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
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
Fermi
be36a8bb33 Cleanup 2019-06-15 18:04:06 +01:00
Fermi
79d176336c A few minor fixes. 2019-06-15 11:36:38 +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
deathride58
d79a58b3f4 Merge pull request #8634 from Ghommie/Ghommie-cit46 
fixes low-charge stunbatons & co.
 2019-06-14 20:44:19 -04:00
Ghommie
a3c2ed0b52 fixes. 2019-06-15 02:19:57 +02:00
deathride58
2f47fbdd8b Merge pull request #8628 from BlackMajor/Pie 
Cream Pies now transfer a portion of their reagents on hitting someone
 2019-06-14 19:18:12 -04:00
Fermi
7a66039f0c Fixing merge errors. 
Testmerge ready.
 2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Trilbyspaceclone
f32291146b Update all_nodes.dm 2019-06-14 12:02:55 -04:00
Trilbyspaceclone
c5e3010cfa Update misc_designs.dm 2019-06-14 12:01:52 -04:00
Fermi
aa1cb22edc Eigenstate fixes. 2019-06-14 16:26:08 +01:00
Fermi
b4beb006f9 More fixes. 2019-06-14 15:43:48 +01:00
Fermi
d7cffadc13 Fixes 2019-06-14 13:43:57 +01:00
Fermi
2365f7337c Adventures in bitflags! 2019-06-14 12:47:22 +01:00
Useroth
ec1ff9ada3 The joy of making an error in a webedit. 2019-06-14 13:05:36 +02:00
Fermi
e95b371ea5 Changed to weakness 2019-06-14 11:56:28 +01:00
Useroth
bd35b8696c Another commit to get fucking Travis going. 2019-06-14 12:52:03 +02:00
Fermi
d6edc8db1f Preweakeness 2019-06-14 11:43:01 +01:00
Fermi
ab35b018db Indents and eigenstate var reduction. 2019-06-14 11:24:21 +01:00
Fermi
ee458b102f bitflags 2019-06-14 10:45:36 +01:00
Arturlang
fb150c355e Merge pull request #1 from Arturlang/master 
hopefully this works to fix travis
 2019-06-14 11:47:14 +03:00
Ghommie
cf56870b57 Fixes the sacrificial target icon not displaying on the cult objective alert. 2019-06-13 23:48:15 +02:00