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

4765 Commits

Author SHA1 Message Date
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
d30560f7d7 Merge pull request #8722 from Trilbyspaceclone/patch-186 
Makes tower shield be see able
 2019-06-23 06:52:25 -07:00
kevinz000
294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57 
ports "Componentizes orbiting"
 2019-06-23 06:50:32 -07:00
kevinz000
fc9a5415d8 Merge pull request #8678 from Sishen1542/SECMANBAD 
Fixes Plush Doll Loot [FOR REAL THIS TIME]
 2019-06-23 06:48:53 -07:00
kevinz000
082d6c75a9 Merge pull request #8688 from Ghommie/Ghommie-cit67 
Ports in bee plushes.
 2019-06-23 06:45:49 -07:00
kevinz000
228df53c99 Merge pull request #8698 from Ghommie/Ghommie-cit72 
Fixes "Penlights Cannot Give Eye Exams"
 2019-06-23 06:41:03 -07:00
kevinz000
e7331b3c98 Merge pull request #8571 from Thalpy/Dwarf 
Medical smartdarts.
 2019-06-23 06:24:10 -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
Trilbyspaceclone
d85a2f5f4a Update arcade.dm (#8675) 2019-06-23 05:59:35 -07:00
Trilbyspaceclone
1d4f55cab2 makes tower shield be seeable 2019-06-22 13:34:08 -04:00
Fermi
713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
Ghommie
44a9fe9521 Fixes "Penlights Cannot Give Eye Exams" 2019-06-19 13:38:59 +02:00
Ghommie
55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Ghommie
df9c4fd1f4 [s] Ports "Fixes PDA TK exploits" 2019-06-19 03:08:44 +02:00
Fermi
095ea1243b Fits better. 2019-06-19 00:39:38 +01:00
Fermi
f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi
fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Ghommie
3e834004ec Ports in bee plushes. 2019-06-18 23:31:09 +02:00
Sishen
95a6b5d7a9 Update arcade.dm 2019-06-17 14:35:24 -04:00
Sishen
96f0f0bd24 Update arcade.dm 2019-06-17 14:31:24 -04:00
Ghom
2845428c03 ports "Improve efficiency of SSmapping init" (#8651) 2019-06-17 11:18:28 -07:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01: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
kevinz000
28ca8dee46 Merge pull request #8648 from Trilbyspaceclone/patch-178 
Buffs uplink kits
 2019-06-16 19:47:09 -07:00
kevinz000
78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172 
Organ Storage box
 2019-06-16 19:43:10 -07:00
kevinz000
302b235911 Merge pull request #8505 from BurgerLUA/RCDMEMES 
Clockwork Cult walls can no longer be deconstructed by RCDs when heated.
 2019-06-16 19:42:15 -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
1739ee1685 Merge pull request #8578 from Ghommie/Ghommie-cit41 
Clears up Extinguisher's slippery instructions.
 2019-06-16 19:38:23 -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
1a6450a2e2 Merge pull request #8416 from Trilbyspaceclone/patch-135 
Gives sec EVA suits storge some Sec Jetpacks
 2019-06-16 19:35:05 -07:00
kevinz000
6c560c566f Merge pull request #8579 from Trilbyspaceclone/patch-171 
Gives gangs a new shield and makes their boots cheaper
 2019-06-16 19:32:38 -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
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
Trilbyspaceclone
5716ea7a4b Update shields.dm 2019-06-16 10:22:07 -04:00
kevinz000
89dd3d4e87 Merge pull request #8657 from BlackMajor/Dunga 
HAHA WHOOPS I ACCIDENTALLY NUKED IT
 2019-06-16 03:11:26 -07:00
BlackMajor
979455d86a HAHA WHOOPS 2019-06-16 22:10:00 +12:00
kevinz000
b0264414b2 Merge pull request #8576 from Sishen1542/whipcrack 
Whips are long again (except yours, curator)
 2019-06-16 01:18:37 -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
9c0cc52771 Merge pull request #8600 from Sishen1542/plushsalt 
Makes plushies not a 2% prize from the arcades
 2019-06-16 01:11:37 -07:00
kevinz000
12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174 
Adds medical breifcases
 2019-06-16 01:11:11 -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
BlackMajor
0294cba855 Merge pull request #8213 from Citadel-Station-13/kevinz000-patch-33 
shuttle purchase announcements are no longer delayed by mapload's blocking proccall
 2019-06-16 20:09:15 +12: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
4135bcfa77 Merge pull request #8639 from Useroth/ninja-shit 
Ninja tweaks and improvements. Take two.
 2019-06-16 01:03:34 -07:00
BlackMajor
5c99bbbd45 Undoing first step into scaling damage for fullmerge reasons 2019-06-16 20:00:31 +12:00