shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,183 Commits 5 Branches 0 Tags
8ff64f687479f78c3cf45ff5056f71ec7951e00a
Commit Graph

9031 Commits

Author SHA1 Message Date
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
vuonojenmustaturska c64a8a8d6b Merge pull request #35604 from ACCount12/construction_datum_refactor 
Refactors mech construction datums
 2018-02-17 10:00:09 -06:00
LetterJay 06dd2e2aa5 Update corpse.dm 2018-02-17 09:58:42 -06:00
LetterJay b6ad24b9da Merge pull request #5541 from Citadel-Station-13/upstream-merge-35734 
[MIRROR] Cleans up unused /area paths
 2018-02-17 09:57:18 -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
LetterJay 7b87214309 Merge pull request #5537 from Citadel-Station-13/upstream-merge-35717 
[MIRROR] Fixes AI dating
 2018-02-17 09:56:40 -06:00
vuonojenmustaturska 22fb75d2a6 Merge pull request #35735 from coiax/fire-proof-hands 
RESISTHOT species can put out fires with their hands
 2018-02-17 09:39:29 -06:00
vuonojenmustaturska 7214836012 Merge pull request #35734 from ShizCalev/path-cleanup 
Cleans up unused /area paths
 2018-02-17 09:39:20 -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
Jordan Brown 48f6e72293 Merge pull request #35716 from AnturK/slipspace 
Fixes wet space.
 2018-02-17 00:48:18 -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 8b3ae0fdd5 Merge branch 'master' into QM-as-Head 2018-02-16 16:09:18 +00: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
LetterJay 84f12df08e Update weldingtool.dm 2018-02-16 07:54:39 -06:00
LetterJay 8b1e818b2d Update singularityhammer.dm 2018-02-16 07:54:19 -06:00
LetterJay 420f889c9d Update phazon.dm 2018-02-16 07:54:10 -06:00
LetterJay 1983e62c1b Update durand.dm 2018-02-16 07:54:03 -06:00
LetterJay 8b2e073841 Update message_server.dm 2018-02-16 07:53:54 -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 377c116662 Merge branch 'master' into QM-as-Head 2018-02-16 13:09:58 +00: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
vuonojenmustaturska 5ea2e57419 Merge pull request #35629 from ShizCalev/floor-tool_acts 
Converts floor tool interactions to tool_act, fixes flooring exploits
 2018-02-16 06:07:19 -06:00