shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,936 Commits 5 Branches 0 Tags
d2e13833d60e98e26ddfdf533d544e2a812f2ae3
Commit Graph

5144 Commits

Author SHA1 Message Date
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339 
[MIRROR] Support stations with multiple z-levels
 2018-02-17 21:24:48 +00:00
deathride58
6a7d414fdf fixes compiling errors hopefully 2018-02-17 15:57:34 -05:00
deathride58
f072def90e Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673 
[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.
 2018-02-17 20:44:57 +00:00
deathride58
305849fba4 Merge pull request #5550 from Citadel-Station-13/upstream-merge-35726 
[MIRROR] Reflectors now reset the range of a projectile like before!
 2018-02-17 20:44:06 +00:00
deathride58
e9f6fb08bd Merge pull request #5539 from Citadel-Station-13/upstream-merge-35731 
[MIRROR] Map spawned corpses start with their suit sensors turned off
 2018-02-17 19:31:34 +00:00
deathride58
5374724165 Merge pull request #5535 from Citadel-Station-13/upstream-merge-35707 
[MIRROR] Adds rainbow slime clusterbangs
 2018-02-17 19:31:20 +00:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668 
[MIRROR] Quote the armor lists
 2018-02-17 19:29:50 +00:00
Dax Dupont
f31df38f83 Reflectors now reset the range of a projectile like before! (#35726) 
* Reflectors now reset the range of a projectile.

* how about dem apples
 2018-02-17 13:18:08 -06:00
LetterJay
e809725afd Merge pull request #5525 from jakeramsay007/slimepeoplerework 
[Ready!] The Slimening - Reworking slimepeople to be less like humans without unbalanced advantages.
 2018-02-17 11:51:45 -06:00
LetterJay
3c8fd612a0 Merge pull request #5547 from Citadel-Station-13/upstream-merge-35722 
[MIRROR] Fixes extremely thicc robots
 2018-02-17 11:49:15 -06:00
LetterJay
6cb37cbc3d Merge pull request #5546 from Citadel-Station-13/upstream-merge-35725 
[MIRROR] Jellypeople (and all subtypes) now can actually speak Slime, as intended
 2018-02-17 11:48:51 -06:00
LetterJay
5745b4ada3 Merge pull request #5545 from Citadel-Station-13/upstream-merge-35736 
[MIRROR] Removes abstract shotgun from Summon Guns list
 2018-02-17 11:48:19 -06:00
LetterJay
92526a4a94 Update corpse.dm 2018-02-17 11:47:24 -06:00
Dax Dupont
d368c42a98 Fixes extremely thicc robots (#35722) 
* Fixes extremely fat robots

* grasp
 2018-02-17 10:13:08 -06:00
vuonojenmustaturska
cec7acc0ea Merge pull request #35725 from jakeramsay007/slimepeoplefixes 
Jellypeople (and all subtypes) now can actually speak Slime, as intended
 2018-02-17 10:05:47 -06:00
coiax
40e2685a7c Removes abstract shotgun from Summon Guns list (#35736) 
* Fixes abstract shotgun from Summon Guns list

Fixes #34962.

Looking at the old summon gun list, the comment says this
typepath was supposed to be a Bulldog.

* Removes duplicate bulldog
 2018-02-17 10:05:38 -06:00
vuonojenmustaturska
e4b037d6af Merge pull request #35720 from LetterN/patch-1 
Pulling claw grammar fix
 2018-02-17 10:04:26 -06:00
LetterJay
06dd2e2aa5 Update corpse.dm 2018-02-17 09:58:42 -06:00
LetterJay
8d949c42b3 Merge pull request #5540 from Citadel-Station-13/upstream-merge-34908 
[MIRROR] Adds Modafinil properly this time.
 2018-02-17 09:56:50 -06:00
yorii
f0be955c17 Adds Modafinil properly this time. (#34908) 
* Adds modafinil, a sleep suppressant

* Adds recipe for modafinil

Yes I'm afraid of git now

* Fixed modafinil sleepimmune ids and OD to 15u

During testing 10u was simply much too low

* Change OD sleeping proc to use ignore_sleepimmune

* Fixed stuff to modafinil
 2018-02-17 09:38:08 -06:00
TankNut
a918a06478 Map spawned corpses start with their suit sensors turned off 2018-02-17 08:54:04 -06:00
Jordan Brown
cbb11e81e6 Merge pull request #35717 from AnturK/robolove 
Fixes AI dating
 2018-02-17 00:48:26 -06:00
BordListian
24ab7e0a84 Adds rainbow slime clusterbangs (#35707) 
* - slime
- yes

* - Adds a volatile reaction

* - There is no escape from the standards that live within
- Can't wait for the experimentor review
 2018-02-17 00:47:03 -06:00
Chayse Ramsay
29bdef8664 New UI icon 2018-02-16 21:14:55 +00:00
Leo
a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
LetterJay
61b5191f90 Merge pull request #5528 from Citadel-Station-13/upstream-merge-35702 
[MIRROR] Removes secondary
 2018-02-16 12:10:55 -06:00
LetterJay
209f5dfbba Merge pull request #5529 from Citadel-Station-13/upstream-merge-35697 
[MIRROR] Fixes addiction text
 2018-02-16 12:10:37 -06:00
LetterJay
e57623ca76 Merge pull request #5532 from Citadel-Station-13/upstream-merge-35689 
[MIRROR] Space Ninja smoke bomb refill
 2018-02-16 12:10:18 -06:00
MetroidLover
55f9129141 Space Ninja smoke bomb refill (#35689) 
* Ninja Smoke Bomb refill

Adds Ninja smoke bomb refill ability.

* Change a spaghetti flaw.

* I fluffed the indentation again. :P
 2018-02-16 10:39:13 -06:00
AnturK
3e12e1b2f6 Some antag fixes. (#35690) 
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
 2018-02-16 10:35:55 -06:00
Jordan Brown
238591128c Merge pull request #35697 from praisenarsie/patch-34 
Fixes addiction text
 2018-02-16 10:33:32 -06:00
Jordan Brown
fc7dbc8322 Merge pull request #35702 from DaedalusGame/scholar-of-the-first-sin-edition 
Removes secondary
 2018-02-16 10:32:18 -06:00
Chayse Ramsay
47e9b2fe63 More Requested Changes 2018-02-16 15:52:28 +00:00
Chayse Ramsay
7565f1e1f1 Undoing what should be an upstream fix 2018-02-16 15:36:20 +00:00
Chayse Ramsay
a8dcbd0dd4 Gives Jellypeople and subtypes the ability to actually SPEAK slime, not just understand it. Upstream oversight corrected. 2018-02-16 15:26:00 +00:00
Chayse Ramsay
e040e5523f Requested Changes Part 1 2018-02-16 15:14:31 +00:00
Chayse Ramsay
b233e05bfe Altering coldmod to make it a little less ridiculous. Now back the original value but with no heat or burn protection. 2018-02-16 15:06:13 +00:00
deathride58
a3180b0173 Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431 
[MIRROR] html_interface removal and crew monitoring console refactor.
 2018-02-16 14:27:26 +00:00
deathride58
8fa2cd7738 Merge pull request #5522 from Citadel-Station-13/upstream-merge-35703 
[MIRROR] Fixes powercell injecting attaching the wrong value to rigged
 2018-02-16 14:17:53 +00:00
deathride58
a2ae777a5a Merge pull request #5524 from Citadel-Station-13/upstream-merge-35629 
[MIRROR] Converts floor tool interactions to tool_act, fixes flooring exploits
 2018-02-16 14:16:23 +00:00
deathride58
57e6eb7b1e Merge pull request #5527 from Citadel-Station-13/upstream-merge-35696 
[MIRROR] Fixes wizard RPG loot from making circuit analyzers useless
 2018-02-16 14:15:12 +00:00
LetterJay
a2d0aa25a6 Merge pull request #5520 from Citadel-Station-13/upstream-merge-35656 
[MIRROR] Fixes a runtime in NTNet scanner
 2018-02-16 07:55:42 -06:00
LetterJay
ad8bab3fc1 Merge pull request #5519 from Citadel-Station-13/upstream-merge-35484 
[MIRROR] Converting more auto_custom antagonists.
 2018-02-16 07:55:29 -06:00
LetterJay
798ba717fa Merge pull request #5518 from Citadel-Station-13/upstream-merge-35679 
[MIRROR] Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement
 2018-02-16 07:55:19 -06:00
LetterJay
e0cb508207 Update shield.dm 2018-02-16 07:54:48 -06:00
Jordan Brown
d6b493f2ec Merge pull request #35696 from Xhuis/circuit_rpg_loot 
Fixes wizard RPG loot from making circuit analyzers useless
 2018-02-16 07:52:59 -06:00
Chayse Ramsay
f66931142c More corrections 2018-02-16 12:49:47 +00:00
Chayse Ramsay
665a7f0a4b Correcting the roundstart slimeperson heat and burn mod 2018-02-16 12:47:49 +00:00
Chayse Ramsay
28e7e980d7 Correcting a species_traits flag issue 2018-02-16 12:46:56 +00:00
Chayse Ramsay
482c21b296 Slimepeople Rework 2018-02-16 12:44:23 +00:00