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

4648 Commits

Author SHA1 Message Date
AnalWerewolf
8337692650 Merge branch 'master' into Fritz-cute 2019-06-10 15:15:41 +10:00
kevinz000
543c9c07e2 Merge pull request #8567 from Arturlang/RPD-Update 
You can now use an RPD on windows and Grilles.
 2019-06-08 12:05:26 -07:00
kevinz000
b69986e544 Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements 
Arcade Loot Improvements + Battlemachine Tweaks
 2019-06-08 03:53:13 -07:00
kevinz000
50cee124c5 Merge pull request #8563 from Sishen1542/Prideful 
Pride-struck Hammer in hands/on back
 2019-06-08 03:00:05 -07:00
kevinz000
658f14275b Merge pull request #8559 from Ghommie/Ghommie-cit36 
Ports in the get_area conversion to define.
 2019-06-08 01:26:45 -07:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000
4650e4d353 Merge pull request #8557 from Ghommie/Ghommie-cit34 
Ports the fix for that stupid z-level edge pull breaking bug.
 2019-06-08 01:26:17 -07:00
kevinz000
aca85123be Merge pull request #8555 from Ghommie/Ghommie-cit32 
Updates radials, makes RCD and RCL use em.
 2019-06-08 01:25:37 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
kevinz000
a37bf5bfaf Merge pull request #8541 from Trilbyspaceclone/patch-164 
Adds implanter and implanter cases to syndie surgery bags
 2019-06-08 01:21:28 -07:00
kevinz000
80aa303b4e Merge pull request #8501 from Trilbyspaceclone/boxen 
Colored boxes, more box icons, and more craftable box types!
 2019-06-08 01:10:11 -07:00
kevinz000
f201bd1508 Merge pull request #8494 from Trilbyspaceclone/ash_walker 
Ash walker bone satchles.
 2019-06-08 01:09:26 -07:00
kevinz000
3b24e05dd6 Merge pull request #8483 from Ghommie/Ghommie-cit23 
Ports in combat gloves plus.
 2019-06-08 01:07:18 -07:00
kevinz000
7875ca73be Merge pull request #8444 from dtfe3/patch-1 
CWC player requirement increase
 2019-06-08 01:03:37 -07:00
kevinz000
68ef76e09a Merge pull request #8432 from Ghommie/Ghommie-cit15 
Buffs stunprods to not have a cooldown
 2019-06-08 01:03:01 -07:00
deathride58
3051994c0e Merge pull request #8546 from Sishen1542/Plushies 
Crew Plushies! Redtail, Annie, Paxton, Mason.
 2019-06-08 01:10:25 -04:00
deathride58
8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf 
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
 2019-06-08 01:07:56 -04:00
Arturlang
39775a08ac Update RPD.dm 2019-06-07 19:56:31 +03:00
Sishen
b467d144ef pridebois 2019-06-07 05:53:07 -04:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
AnalWerewolf
4ff12eebd0 he bork and he woof 2019-06-07 18:10:22 +10:00
Ghommie
b6f35435ec Ports the get_area conversion to define. 2019-06-07 06:50:26 +02:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
f8903a871e Another episode of "fixing that stupid map edge bug again". 2019-06-07 04:55:05 +02:00
Ghommie
a6fcac55d4 Makes it compile. 2019-06-07 04:05:27 +02:00
Ghommie
5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
Sishen
b9b219d561 adds redtail 2019-06-06 16:01:40 -04:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie
44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 2019-06-06 15:24:31 +02:00
Ghommie
0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
Sishen
cf3002a392 slimeplush 2019-06-06 05:14:01 -04:00
Trilbyspaceclone
03132569a7 Update backpack.dm 2019-06-05 15:54:51 -04:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs 
Ports gang mode
 2019-06-05 01:55:19 -07:00
kevinz000
cc2d3a7f10 Merge pull request #8516 from Ghommie/Ghommie-cit26 
Makes clockwork wall - sonic jackhammer interaction account the wall's superheating.
 2019-06-05 01:53:34 -07:00
kevinz000
102d68a243 Merge pull request #8518 from Ghommie/Ghommie-cit27 
Fixes and updates pod's emergency suits storage.
 2019-06-05 01:41:23 -07:00
deathride58
b95b14d033 Merge pull request #8515 from Ghommie/Ghommie-cit25 
Fixes stunbatons' icons not properly updating on cell fiddling, plus cell maxcharge leniency.
 2019-06-03 17:51:13 -04:00
BurgerLua
c98d2ce5a0 nuke be gone 2019-06-02 15:21:45 -07:00
Ghommie
6be3496d36 Merge branch 'Ghommie-cit15' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit15 2019-06-02 22:50:02 +02:00
Ghommie
a0898a779a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit15 2019-06-02 22:48:38 +02:00
Ghommie
472d7ef8cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27 2019-06-02 19:03:34 +02:00
Ghommie
73e279dada excessive parenthesis wrapping. 2019-06-02 18:29:43 +02:00
Ghommie
d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02:00
Ghommie
e6e06a1a43 Makes clockwork wall - sonic jackhammer interaction account the wall's superheating. 2019-06-02 13:59:36 +02:00
Ghommie
ae5d68c6f9 Fixes stunbatons' icons not properly updating on cell removal, and more cell charge leniency. 2019-06-02 13:24:03 +02:00
BurgerLua
e7802a9b03 Arcade Loot Improvements 2019-06-02 02:02:47 -07:00
kevinz000
8b27926fee Merge pull request #8463 from Trilbyspaceclone/metal_shields 
Makeshift Metal shield crafting
 2019-05-31 18:00:12 -07:00
kevinz000
2a5bbfdafc Merge pull request #8482 from Ghommie/Ghommie-cit22 
fixes pacifism eyestabbing, better this time.
 2019-05-31 17:59:33 -07:00
kevinz000
16c89da587 Merge pull request #8485 from Trilbyspaceclone/plushies 
More plushies - Reece Trilby Bhijn Box Justin
 2019-05-31 17:55:37 -07:00
kevinz000
07d3b0361c Merge pull request #8466 from Poojawa/vis-overlay-insolence 
Fixes atmos and station alert consoles not updating visually
 2019-05-31 17:44:39 -07:00
kevinz000
a96e414d2f Merge pull request #8486 from BlackMajor/Ooga 
Supermatter no longer works while inside of a turf.
 2019-05-31 17:40:30 -07:00