shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,886 Commits 5 Branches 0 Tags
6b0bb7268e2eebca95021e1baaf8a770cc7af631
Commit Graph

3155 Commits

Author SHA1 Message Date
LetterJay
6b0bb7268e Merge pull request #3611 from Citadel-Station-13/upstream-merge-31945 
[MIRROR] Adds ambience to the SM and portable generators
 2017-10-27 02:16:02 -04:00
LetterJay
49fa09d1bd Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944 
[MIRROR] Atmos construction rework again
 2017-10-27 02:00:11 -04:00
LetterJay
4facc9c04e Update pump.dm 2017-10-27 00:23:13 -05:00
LetterJay
2b699d8d73 Update volume_pump.dm 2017-10-27 00:05:28 -05:00
LetterJay
646ddb9bc2 Merge pull request #3609 from Citadel-Station-13/upstream-merge-32089 
[MIRROR] Fixes light source qdel issues.
 2017-10-26 16:54:17 -04:00
LetterJay
bdeaa6e886 Merge pull request #3607 from Citadel-Station-13/upstream-merge-32076 
[MIRROR] Fixes SoC creating braindead aliens
 2017-10-26 16:53:40 -04:00
LetterJay
4cc0cf3ee7 Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972 
[MIRROR] Greyscale cables
 2017-10-26 16:53:08 -04:00
LetterJay
1ecd723475 Merge pull request #3597 from Citadel-Station-13/upstream-merge-32071 
[MIRROR] Fixes heartbeat message spam
 2017-10-26 16:50:51 -04:00
Emmett Gaines
c7d3696636 Adds ambience to the SM and portable generators (#31945) 
* Adds aambience to the SM and portable generators

* lowered pitch of supermatter

* start and end fix
 2017-10-25 23:37:14 -05:00
Kyle Spier-Swenson
671ae577f0 Fixes light source qdel issues. 2017-10-25 23:34:52 -05:00
ShizCalev
7c34440a06 Fixes braindead aliums 2017-10-25 23:32:33 -05:00
Emmett Gaines
ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
CitadelStationBot
f6331eedf8 [MIRROR] Shuttle navigation computers ignore the shuttle when placing a new location (#3596) 
* Shuttle navigation computers ignore the shuttle when placing a new location (#31722)

* Fixed the shuttle navigation computer allowing you to move stationary docking ports

* Made the shuttle navigation computer ignore the shuttle it controls when determining valid turfs

* Removed a redundant list

* Moved a var from stationary docking ports to mobile docking ports

* Removed a sanity check

* Shuttle navigation computers ignore the shuttle when placing a new location
 2017-10-25 20:03:11 -05:00
CitadelStationBot
7ee7942aa4 [MIRROR] [s] Fixes changling golem exploit (#3600) 
* Merge pull request #32061 from ShizCalev/ling-golem-exploit-fix

Fixes changling golem exploit

* [s] Fixes changling golem exploit
 2017-10-25 20:01:52 -05:00
CitadelStationBot
7ad3afa3c0 [MIRROR] Footprints no longer contain stupid amounts of blood (#3602) 
* Footprints no longer contain stupid amounts of blood (#32056)

* Footprints no longer contain stupid amounts of blood
 2017-10-25 20:01:31 -05:00
Leo
1f83d3cbb7 Merge pull request #32071 from ShizCalev/heart-spam-fix 
Fixes heartbeat message spam
 2017-10-25 18:55:24 -05:00
LetterJay
95bae508aa Merge pull request #3595 from deathride58/roboticsurgerymanualmirror 
Manual mirror of upstream robotic surgery PR
 2017-10-25 14:53:01 -04:00
deathride58
d6735ad5b5 Fuck 2017-10-25 14:40:40 -04:00
deathride58
70a2c466f3 manual mirror of upstream robotic surgery pr 2017-10-25 14:29:45 -04:00
JJRcop
b237b8286a heart of darkness revives non-shadow as shadowpeople 2017-10-25 00:13:05 -05:00
deathride58
a664384e81 Bhijn's touching dogborg balance again everyone panic (#3432) 
* rebuffs everything and puts babyproof locks on scrubpup compactor

* lets it compile, removes things from the blacklist

* readds telegraphing due to popular vote, removes flash from scrubpups

* does githubs text editor work for basic thing on mobile

* reverts blacklist changes

* keeps spoolup, removes sounds + anime prepounce effects
 2017-10-24 22:04:51 -05:00
LetterJay
bb6cbd8528 Merge pull request #3593 from Citadel-Station-13/revert-3584-revert-3580-upstream-merge-31560 
Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
 2017-10-24 21:30:11 -04:00
LetterJay
3822aa83a3 Update new_player.dm 2017-10-24 19:49:38 -05:00
LetterJay
40c2a8d40b Merge pull request #3592 from Citadel-Station-13/upstream-merge-31956 
[MIRROR] Ratvar summoning now ends the round/triggers mass proselytize
 2017-10-24 19:35:38 -04:00
LetterJay
0f9bc30e78 Merge pull request #3587 from Citadel-Station-13/upstream-merge-32027 
[MIRROR] fixes pentetic acid dealing radiation damage instead of healing it
 2017-10-24 19:34:48 -04:00
LetterJay
2b30b572ac Merge pull request #3582 from Citadel-Station-13/upstream-merge-32016 
[MIRROR] Fixes xenobio sentience giving the wrong name
 2017-10-24 19:28:34 -04:00
LetterJay
82840f4a62 Merge pull request #3581 from Citadel-Station-13/upstream-merge-32001 
[MIRROR] Blacklists holo injectors from surplus crates
 2017-10-24 19:24:47 -04:00
LetterJay
72bd156589 Update new_player.dm 2017-10-24 18:19:49 -05:00
LetterJay
e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
KorPhaeron
514533ddaf Ratvar summoning now ends the round/triggers mass proselytize (#31956) 
* Slight changes to ratvar ending

* Tick check

* T

* Why Xhuis?

* Lots of fire

* That src made sense 10 minutes ago but no longer

* More commits than line changes

* Check Tick
 2017-10-24 18:07:06 -05:00
kevinz000
f4bac0619b fixes pentetic acid dealing radiation damage instead of healing it (#32027) 
* Update medicine_reagents.dm

* sorry i alughed so hard i hit a key
 2017-10-24 10:55:21 -05:00
LetterJay
aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
ShizCalev
af71944d71 Fixes xenobio sentience giving the wrong name (#32016) 2017-10-24 00:04:33 -05:00
jughu
9848da0544 Blacklists holo injectors from surplus crates (#32001) 
* Update uplink_item.dm

* Update uplink_item.dm
 2017-10-23 22:54:24 -05:00
Jordan Brown
94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
Jordan Brown
6199191dd8 Merge pull request #32007 from lzimann/poll 
Selecting multiple choice polls with 1 choice now become a single option poll
 2017-10-23 19:37:05 -05:00
LetterJay
6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883 
[MIRROR] Removes duplicate typecaches
 2017-10-23 20:16:51 -04:00
LetterJay
74580efe35 Merge pull request #3572 from Citadel-Station-13/upstream-merge-31876 
[MIRROR] Makes cleanbots clean up remains
 2017-10-23 17:49:09 -04:00
duncathan salt
ed12370a73 Atmos construction rework again 2017-10-23 16:29:53 -05:00
LetterJay
dd53de8859 Update mob.dm 2017-10-23 14:15:43 -05:00
LetterJay
f0a32458bb Update human_defines.dm 2017-10-23 14:15:30 -05:00
LetterJay
97929ff3f1 Merge pull request #3570 from Citadel-Station-13/upstream-merge-31885 
Fixes #3397
 2017-10-23 15:08:11 -04:00
LetterJay
9436a60b8f Merge pull request #3567 from Michiyamenotehifunana/ears-fix 
Fixes several ears
 2017-10-23 15:07:03 -04:00
LetterJay
f2860a7760 Merge pull request #3565 from Citadel-Station-13/upstream-merge-31990 
[MIRROR] Removes golem rune code
 2017-10-23 14:52:58 -04:00
LetterJay
9f08b1898b Merge pull request #3560 from Citadel-Station-13/upstream-merge-31923 
[MIRROR] Composting plants/pills transfers all reagents
 2017-10-23 14:50:52 -04:00
LetterJay
4136be0361 Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978 
[MIRROR] Cleans up datum traitor minimally.
 2017-10-23 14:50:05 -04:00
LetterJay
04496c1e15 Merge pull request #3557 from Citadel-Station-13/upstream-merge-31896 
[MIRROR] Adds spiders to the shapeshift menu!
 2017-10-23 14:49:41 -04:00
LetterJay
ce2f1cc672 Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981 
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
 2017-10-23 14:48:10 -04:00
LetterJay
11bcd573a0 Update mob_defines.dm 2017-10-23 13:17:52 -05:00
ShizCalev
4cc53d68a2 Makes cleanbots clean up remains (#31876) 
* Makes cleanbots clean up remains

* Gooooooooo

* Acid_act
 2017-10-23 08:38:52 -05:00