shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,297 Commits 5 Branches 0 Tags
242fd0556db0c1bc1e8024bf6efef6cdb0d93b85
Commit Graph

3639 Commits

Author SHA1 Message Date
LetterJay
a9c91b4d00 Merge pull request #6127 from Citadel-Station-13/upstream-merge-36689 
[MIRROR] Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam
 2018-04-01 19:51:58 -05:00
LetterJay
022ac2e6c3 Merge pull request #6178 from Citadel-Station-13/shit 
sanity
 2018-04-01 19:51:39 -05:00
LetterJay
dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548 
[MIRROR] Added a new ability to sentient diseases
 2018-04-01 19:50:43 -05:00
LetterJay
661f8b3468 Merge pull request #6217 from Citadel-Station-13/upstream-merge-36851 
[MIRROR] Adds singular_name to BS polycrystals
 2018-04-01 17:47:37 -05:00
fludd12
7826515aed Walls made entirely of wood! (#36524) 
* Buffs Lifebringers (And kind of botany.)

* Retools staff to use earthsblood as fuel, can now remove rock walls

* No more blessings!

* Dismantle the means of production.
 2018-04-01 12:24:33 -05:00
vuonojenmustaturska
76a9540f80 Merge pull request #36851 from 81Denton/bs-polycrystal-name 
Adds singular_name to BS polycrystals
 2018-04-01 07:27:45 -05:00
LetterJay
bd28b80a10 Merge pull request #6182 from Citadel-Station-13/upstream-merge-36838 
[MIRROR] AIFixer no longer updates overlays on every process()
 2018-04-01 01:03:33 -05:00
LetterJay
c19f285322 Merge pull request #6179 from Citadel-Station-13/upstream-merge-36807 
[MIRROR] Fixes some edge cases with chameleon projectors and sleepers
 2018-04-01 01:03:10 -05:00
LetterJay
961c69a8e5 Merge pull request #6193 from Citadel-Station-13/upstream-merge-36800 
[MIRROR] Adds check to keep observers from being recognized as servants of ratvar
 2018-03-31 18:43:34 -05:00
LetterJay
78bc5ed7ef Merge pull request #6173 from Citadel-Station-13/upstream-merge-36772 
[MIRROR] Removes derpartment
 2018-03-31 06:22:11 -05:00
LetterJay
05e85ddfb0 Merge pull request #6168 from Citadel-Station-13/upstream-merge-36625 
[MIRROR] Fixes blueprints exploit
 2018-03-31 06:21:14 -05:00
LetterJay
e35ddc7093 Merge pull request #6157 from Citadel-Station-13/upstream-merge-36723 
[MIRROR] Corrects plasma window armor inconsistency
 2018-03-31 06:18:48 -05:00
LetterJay
71af2a9bc5 Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477 
[MIRROR] Science goggles detect grenade reagents
 2018-03-31 06:17:37 -05:00
LetterJay
d509014cd3 Merge pull request #6151 from Citadel-Station-13/upstream-merge-36655 
[MIRROR] Fixes hot potato coloration
 2018-03-31 06:17:22 -05:00
LetterJay
9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617 
[MIRROR] Improves some logging legibility
 2018-03-31 06:17:11 -05:00
AlexTheSysop42
360eb223b3 Adds check to keep observers from being recognized as servants of ratvar (#36800) 
* Comments out code to try to fix a bug

* fixes servant ghosts being trapped on Reebe

* protip: next time don't commit to master

* ghosts no longer count as servants

* Undoes ghost check, moved to is_servant_of_ratvar

* change istype to isliving
 2018-03-31 06:17:10 -05:00
Cruix
0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
Robustin
72348f6235 wow 2018-03-31 06:14:31 -05:00
Jordan Brown
675b5570b8 Merge pull request #36807 from vuonojenmustaturska/champrojectoragain 
Fixes some edge cases with chameleon projectors and sleepers
 2018-03-31 06:13:00 -05:00
kevinz000
84ac06c986 Yeah no 2018-03-31 04:07:29 -07:00
Jordan Brown
9520546277 Merge pull request #36772 from vuonojenmustaturska/dertpartment 
Removes derpartment
 2018-03-29 08:34:02 -05:00
kevinz000
9442a2905e Fixes blueprints exploit (#36625) 
* Fixes blueprints exploit

* redundent qdeleted
 2018-03-29 04:35:09 -05:00
RandomMarine
d7cd4726a2 Fixes plasma window fire armor 2018-03-28 13:37:53 -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
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
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
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
7977ac2818 Update dance_machine.dm 2018-03-27 13:50:40 -04: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
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
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
85a621f717 Merge pull request #6113 from Citadel-Station-13/upstream-merge-36695 
[MIRROR] Fixes consoles
 2018-03-27 17:45:35 +00: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
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
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
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
Jordan Brown
35f0fe9676 Merge pull request #36716 from 81Denton/bscrystalname 
Adds singular_name to BS crystals
 2018-03-26 14:21:36 -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
arsserpentarium
febcc648af [READY]recycler buff (#36509) 
* recycler

* runtimemitnur

* mkay
 2018-03-26 10:54:04 -05:00
Poojawa
34718e35cd Update medical.dm 2018-03-26 04:32:36 -05:00
CitadelStationBot
de697be536 [MIRROR] Fix unwrenching and placing directional signs (#6106) 
* Fix unwrenching and placing directional signs

* Merge pull request #36677 from AutomaticFrenzy/patch/sign-backings

Fix unwrenching and placing directional signs
 2018-03-26 04:30:33 -05:00
CitadelStationBot
9f5682fa35 [MIRROR] New torch sprites, fixed missing inhands (#6099) 
* New torch sprites, fixed missing inhands

* missing sprites
 2018-03-26 04:27:30 -05:00
CitadelStationBot
bb1aaf01e7 [MIRROR] Plastic flaps are now airtight (#6098) 
* Plastic flaps are now airtight (#36659)

* flaps

* fucking flaps, how do they work?

* Plastic flaps are now airtight
 2018-03-26 04:20:12 -05:00
CitadelStationBot
4f254f181f [MIRROR] Sintouched antag datums (#6096) 
* Sintouched antag datums (#36561)

* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs

* Sintouched antag datums
 2018-03-26 04:19:49 -05:00
oranges
3a93b7e75a Fixes consoles 2018-03-26 02:30:18 -05:00
CitadelStationBot
3e25c34dbc [MIRROR] Turret's process() is now 52% more efficient (#6107) 
* Turret's process() is now 52% more efficient

* Turret's process() is now 52% more efficient (#36662)

* 52% more efficient process()

* Less unecessary popdown calls

* webediting
 2018-03-25 20:22:55 -07:00
CitadelStationBot
b02180de44 [MIRROR] fixes airlock audio inconsistency (#6068) 
* fixes airlock audio inconsistency (#36574)

* fixes inconsistency

* replaces sound

* src

* fixes airlock audio inconsistency
 2018-03-22 06:11:42 -05:00
CitadelStationBot
bd3d76b8d3 [MIRROR] Modularises vending machines (#6050) 
* Modularises vending machines

* Update vending_items.dm
 2018-03-22 06:10:17 -05:00