shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,828 Commits 5 Branches 0 Tags
70a2c466f3bd53977859bcafaa36cff82e04bdca
Commit Graph

3135 Commits

Author SHA1 Message Date
deathride58
70a2c466f3 manual mirror of upstream robotic surgery pr 2017-10-25 14:29:45 -04: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
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
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
vuonojenmustaturska
1930e5cf84 Fixes grinders (#31885) 
* But you're still hungry

* Update reagentgrinder.dm
 2017-10-23 08:22:17 -05:00
Michiyamenotehifunana
9d52443c53 Fixes #2946 
Otusian, wolf, and skunk ears now show up on humans. Cat, Big ears now show up on mammals.
 2017-10-23 19:29:46 +08:00
LetterJay
a1236008f3 Merge pull request #3552 from Citadel-Station-13/upstream-merge-31355 
[MIRROR] Code Consistency: luminosity --> light_range
 2017-10-23 03:44:46 -04:00
LetterJay
58ef2f1872 Merge pull request #3551 from Citadel-Station-13/upstream-merge-31922 
[MIRROR] Adds admin override for false alarm event.
 2017-10-23 03:44:25 -04:00
LetterJay
20bbd77f73 Merge pull request #3549 from Citadel-Station-13/upstream-merge-31974 
[MIRROR] Biosuits now offer high Rad resistance
 2017-10-23 03:44:18 -04:00
LetterJay
82d02050cd Merge pull request #3547 from Citadel-Station-13/upstream-merge-31989 
[MIRROR] Fixes silicon mob contents becoming contaminated
 2017-10-23 03:35:35 -04:00
LetterJay
8382fdf6b6 Merge pull request #3545 from Citadel-Station-13/upstream-merge-31960 
[MIRROR] Splits clothing.dm in 7 other files
 2017-10-23 03:35:25 -04:00
LetterJay
d7ee78ec0d Update xenobiology.dm 2017-10-23 01:27:54 -05:00
LetterJay
4dc2ac3d94 Merge branch 'master' into upstream-merge-31913 2017-10-23 01:25:35 -04:00
YPOQ
60e45814ab Removes golem rune code 2017-10-23 00:10:47 -05:00
YPOQ
082a713848 Composting plants/pills transfers all reagents (#31923) 2017-10-22 17:53:24 -05:00
AnturK
0faee43f95 Cleans up datum traitor minimally. (#31978) 
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
 2017-10-22 17:44:55 -05:00
LetterJay
5bce9bc2b0 Merge pull request #3514 from Citadel-Station-13/upstream-merge-31904 
[MIRROR] Fixes stack overflow in orbit datum
 2017-10-22 16:39:58 -04:00
LetterJay
5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780 
[MIRROR] Disentangles blob from blob mode/removes blob mode
 2017-10-22 16:39:35 -04:00
Armhulen
404740d784 Adds spiders to the shapeshift menu! (#31896) 
* >gondolas

* :(
 2017-10-22 13:55:07 -05:00
vuonojenmustaturska
1794018ae1 Removes mob.lastattacked and replaces lastattacker with a string 2017-10-22 11:29:35 -05:00
LetterJay
98f1560e6b Merge pull request #3546 from Citadel-Station-13/upstream-merge-31964 
[MIRROR] Blood Brother now properly sets special role
 2017-10-22 12:26:01 -04:00
LetterJay
2970c7d66f Merge pull request #3542 from Citadel-Station-13/upstream-merge-31931 
[MIRROR] It's a time to stop warning about paper bins eating pens
 2017-10-22 12:25:33 -04:00
LetterJay
74411b190d Merge pull request #3541 from Citadel-Station-13/upstream-merge-31958 
[MIRROR] Fixes quick_attack_loop stack overflow
 2017-10-22 12:25:18 -04:00