shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,067 Commits 5 Branches 0 Tags
773a94dea69b51777991afeb5d7cfd79cf6daa41
Commit Graph

12455 Commits

Author SHA1 Message Date
Jalleo
8ff1fdd907 Little fix to RPED (#36610) 
* Why use a weird proc to check it than set a static list? Yes one is technically more expensive but better maintainability

* Changes to what Cyberboss suggested (For performance reasons?)

* oranges and Antur make sense with the && False its just a false return instead.

* Man I need to read more areas of the codebase that entire proc being modified was not required with my list change......
 2018-03-28 13:39:18 -05:00
MrDoomBringer
efb3dceb32 Fixes the cargo Express Console's description [wtf why is there a sprites tag] (#36765) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* mfw the space jews finally leave the drop pod buisiness

gimme gimme the gee bee pee

the fuck ahaha
 2018-03-28 13:38:04 -05:00
RandomMarine
d7cd4726a2 Fixes plasma window fire armor 2018-03-28 13:37:53 -05:00
Jordan Brown
4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
yorii
130337797d Science goggles detect grenade reagents (#36477) 
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
 2018-03-28 12:18:18 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
vuonojenmustaturska
6e02f61b37 Merge pull request #36734 from Robustin/colossusfix 
Colossus projectile runtime removal
 2018-03-28 12:17:54 -05:00
kevinz000
8c98e4769c Fixes hot potato coloration (#36655) 
* Fixes hot potato coloration

* wupps
 2018-03-28 12:17:45 -05:00
vuonojenmustaturska
adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup 
Improves some logging legibility
 2018-03-28 12:17:32 -05:00
vuonojenmustaturska
888ca609a8 Merge pull request #36636 from ShizCalev/robo-limb-shake-message 
Fixes prosthetic limbs injury messages
 2018-03-28 12:17:23 -05:00
BeeSting12
cb8f3e9293 >happend 2018-03-28 12:17:14 -05:00
fludd12
13593d757b Nutriment can get you fat again. 2018-03-28 12:17:06 -05:00
vuonojenmustaturska
7020c19dff Merge pull request #36736 from fludd12/light-up-the-night 
Assemblies with lighting circuits now properly update light position.
 2018-03-28 12:16:56 -05:00
iksyp
c0e45aa0a8 Night vision goggles no longer cancel out thermal eyes (#36609) 
cl
fix: night vision goggles no longer overwrite thermal eyes. nvg eyes no longer overwrite thermal goggles.
/cl

fixes #35921
 2018-03-28 12:16:38 -05:00
Robustin
ff3818aa86 Gas react is much more efficient (#36667) 
* React but with some conditions first

* Update gas_types.dm

* Webeditor maymay

* This might break fire but isn't that what freezes are for?

* More webeditor memes

* Did that madman just make it even FASTER?

* Changing list to typecache

* Gotta go faster

* review, dnm yet

* gas.len instead of volume

* Dunc the redeemed

* Merge ready

* Dunc's method actually wasnt the best
 2018-03-28 12:16:15 -05:00
vuonojenmustaturska
6bcd278bb6 Merge pull request #36747 from praisenarsie/patch-36 
Increases monkeycap to 64
 2018-03-28 12:16:06 -05:00
vuonojenmustaturska
b53373dec0 Fixes modular computer ui_interact runtime 2018-03-28 12:15:58 -05:00
vuonojenmustaturska
0a63f55771 Makes chem dispenser recharging far less glacial (#36700) 
* meme

* Makes chem dispenser recharging far less glacial

* Update chem_dispenser.dm
 2018-03-28 12:15:24 -05:00
vuonojenmustaturska
c98ce25dfb adds an admin follow link to revenant spawns 2018-03-28 12:15:15 -05:00
Ashe Higgs
8ec16df2e4 Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426) 
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
 2018-03-28 12:15:06 -05:00
Dennok
30d5f3af17 Pipenet fix (#36230) 
* Pipenet fix

Fix of Runtime in components_base.dm,91: Cannot read null.parents  proc name: returnPipenet
Return working releaseAirToTurf() on pipe Destroy()
Block of self  merge what cause pipeline anihilation.

* up

* maintainer abuse
 2018-03-28 12:14:47 -05:00
deathride58
d351caf92f Merge pull request #6130 from Citadel-Station-13/upstream-merge-36663 
[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly
 2018-03-27 17:51:35 +00:00
deathride58
e6c16ba8f8 Merge pull request #6129 from Citadel-Station-13/upstream-merge-36597 
[MIRROR] Security records consoles now uploads the center 32x32 of a photo when putting photos in
 2018-03-27 17:51:17 +00:00
deathride58
c3328968a1 Merge pull request #6128 from Citadel-Station-13/upstream-merge-36622 
[MIRROR] Fixes wormhole projectors
 2018-03-27 17:51:00 +00:00
deathride58
7977ac2818 Update dance_machine.dm 2018-03-27 13:50:40 -04:00
deathride58
6bbe0d4150 Merge pull request #6126 from Citadel-Station-13/upstream-merge-36715 
[MIRROR] Replaces sniper bullets ex_act with bonus obj damage
 2018-03-27 17:49:53 +00:00
deathride58
aa415031a0 Merge pull request #6125 from Citadel-Station-13/upstream-merge-36671 
[MIRROR] Fixes machines not updating power when changing areas
 2018-03-27 17:49:35 +00:00
deathride58
c5d3bb3986 Merge pull request #6124 from Citadel-Station-13/upstream-merge-36720 
[MIRROR] Adds sanity check so you don't accidentally pop a fun balloon multiple times
 2018-03-27 17:49:13 +00:00
deathride58
be9ae841b6 Merge pull request #6123 from Citadel-Station-13/upstream-merge-36716 
[MIRROR] Adds singular_name to BS crystals
 2018-03-27 17:48:51 +00:00
deathride58
952fd00ff4 Merge pull request #6122 from Citadel-Station-13/upstream-merge-36712 
[MIRROR] Fixes pacifists being able to attack animals
 2018-03-27 17:48:31 +00:00
deathride58
f8acaf35a8 Merge pull request #6121 from Citadel-Station-13/upstream-merge-36708 
[MIRROR] removes unnecessary message
 2018-03-27 17:48:07 +00:00
deathride58
3a31833a8f Merge pull request #6120 from Citadel-Station-13/upstream-merge-36710 
[MIRROR] Properly Blacklists Mushroom People
 2018-03-27 17:47:42 +00:00
deathride58
ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398 
[MIRROR] [READY]pathfinding circuitry upgrade
 2018-03-27 17:47:11 +00:00
deathride58
87600c4ff4 Merge pull request #6118 from Citadel-Station-13/upstream-merge-36509 
[MIRROR] [READY]recycler buff
 2018-03-27 17:46:23 +00:00
deathride58
34d0d456ff Merge pull request #6117 from Citadel-Station-13/upstream-merge-36697 
[MIRROR] Fixes wet floor scaling
 2018-03-27 17:45:59 +00:00
deathride58
85a621f717 Merge pull request #6113 from Citadel-Station-13/upstream-merge-36695 
[MIRROR] Fixes consoles
 2018-03-27 17:45:35 +00:00
deathride58
66fc54fcd9 Update spellbook.dm 2018-03-27 13:43:48 -04:00
deathride58
15472805ba Merge pull request #6055 from Poojawa/cmo-hypo-objective 
Removes the old hypospray from CMO closet, updates tator objective
 2018-03-27 17:41:44 +00:00
Ashe Higgs
0f39d85a80 Fixes slimeperson traits (#36663) 2018-03-26 21:12:07 -05:00
kevinz000
40776d5ee5 Security records consoles now uploads the center 32x32 of a photo when putting photos in (#36597) 
* Sec console centering photos

* Update security.dm

* whoever coded this before me is triple meme
 2018-03-26 21:04:48 -05:00
kevinz000
f8697faf8f Fixes wormhole projectors (#36622) 2018-03-26 17:19:46 -05:00
Gaz Wilmbroke
d5822a4cbb Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam 2018-03-26 17:18:35 -05:00
XDTM
3d36b34650 Replaces sniper bullets ex_act with bonus obj damage (#36715) 
* Replaces sniper bullets ex_act with bonus obj damage

* Update sniper.dm

* Update sniper.dm
 2018-03-26 17:17:23 -05:00
Jordan Brown
ed6fae603e Merge pull request #36671 from YPOQ/areachangepowerfix 
Fixes machines not updating power when changing areas
 2018-03-26 14:25:06 -05:00
Dax Dupont
46976c4cab Adds sanity check so you don't accidentally pop a fun balloon multiple times (#36720) 
* Adds sanity check so you don't accidentally pop a fun balloon multiple times.

* Fuck it, probably better like this

* heck
 2018-03-26 14:22:53 -05:00
Jordan Brown
35f0fe9676 Merge pull request #36716 from 81Denton/bscrystalname 
Adds singular_name to BS crystals
 2018-03-26 14:21:36 -05:00
Jordan Brown
08569ff906 Merge pull request #36712 from XDTM/NoPunchingIan 
Fixes pacifists being able to attack animals
 2018-03-26 14:19:23 -05:00
Jordan Brown
d6a5f2c831 Merge pull request #36708 from Armhulen/patch-66 
removes unnecessary message
 2018-03-26 14:18:12 -05:00
Jordan Brown
98b308279f Merge pull request #36710 from fludd12/Inky-Capped-Lists 
Properly Blacklists Mushroom People
 2018-03-26 14:18:03 -05:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398) 
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
 2018-03-26 11:01:22 -05:00