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

8851 Commits

Author SHA1 Message Date
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
559ec2fcf6 Merge pull request #5543 from Citadel-Station-13/upstream-merge-35604 
[MIRROR] Refactors mech construction datums
 2018-02-17 11:47:48 -06:00
LetterJay
fb7e1b1438 Merge pull request #5542 from Citadel-Station-13/upstream-merge-35735 
[MIRROR] RESISTHOT species can put out fires with their hands
 2018-02-17 11:47:35 -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
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
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
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
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
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
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
vuonojenmustaturska
d1441f9b23 Merge pull request #35703 from DaedalusGame/ok-sure-why-not 
Fixes powercell injecting attaching the wrong value to rigged
 2018-02-16 05:09:41 -06:00
ACCount
93364c3af6 Fixes a runtime in NTNet scanner (#35656) 2018-02-16 00:46:33 -06:00
AnturK
993f15a415 Converting more auto_custom antagonists. (#35484) 
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
 2018-02-16 00:45:20 -06:00
vuonojenmustaturska
6dfa89fab7 Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679) 
* honk

* qdel memes
 2018-02-16 00:41:04 -06:00
81Denton
42979ee771 dr. satellite I'm EMAG (#35662) 2018-02-16 00:39:51 -06:00
deathride58
c1b3253b8d Merge pull request #5485 from Poojawa/cryopods 
Cryopods from Oracle Station
 2018-02-16 05:56:34 +00:00
LetterJay
14d387fa04 Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542 
[MIRROR] Cleans up some duplicate canusetopic warnings
 2018-02-15 22:17:54 -06:00
oranges
bf5c2ca887 Merge pull request #35693 from tgstation/Cyberboss-patch-2 
Fix world/Error() trying to read config before it loads
 2018-02-15 21:59:41 -06:00
deathride58
f664c21aee Merge pull request #5502 from Citadel-Station-13/upstream-merge-35586 
[MIRROR] Cleans up remnant traitor cyborg code and AI hacking.
 2018-02-16 03:04:35 +00:00
oranges
5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-15 20:35:03 -06:00
deathride58
18f4d78449 Merge pull request #5512 from Citadel-Station-13/upstream-merge-35680 
[MIRROR] Fixes SCP-294 losing its top sometimes
 2018-02-16 01:32:41 +00:00
deathride58
05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552 
[MIRROR] [s]Fixes writing bugs/exploits
 2018-02-16 01:32:23 +00:00
deathride58
64dc40d293 Merge pull request #5509 from Citadel-Station-13/upstream-merge-35606 
[MIRROR] Apples now taste like apples
 2018-02-16 01:31:58 +00:00
deathride58
4c2db869ef Merge pull request #5508 from Citadel-Station-13/upstream-merge-35131 
[MIRROR] Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies
 2018-02-16 01:31:24 +00:00
deathride58
d7c06fec6f Merge pull request #5505 from Citadel-Station-13/upstream-merge-35342 
[MIRROR] Adds Cryostatis Shotgun Darts
 2018-02-16 01:29:14 +00:00
deathride58
a6ac0df5c4 Merge pull request #5504 from Citadel-Station-13/upstream-merge-35651 
[MIRROR] Gives eggbox an inhand image, cleans up heartbox inhands
 2018-02-16 01:28:54 +00:00
deathride58
ee004e3359 Merge pull request #5503 from Citadel-Station-13/upstream-merge-35655 
[MIRROR] fixes firedoor layer for the last god damn time
 2018-02-16 01:28:35 +00:00
deathride58
e873fce53f Update laws.dm 2018-02-15 20:28:05 -05:00
deathride58
91a2c04f0d Update law.dm 2018-02-15 20:27:36 -05:00
deathride58
05a0ce13a1 Merge pull request #5501 from Citadel-Station-13/upstream-merge-35611 
[MIRROR] Spellcheck: Fixed a typo on an eldritch god's pronunciation
 2018-02-16 01:27:09 +00:00