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

5157 Commits

Author SHA1 Message Date
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
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
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
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -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
62f139f217 Update _unit_tests.dm 2018-02-15 20:30:47 -05: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
e873fce53f Update laws.dm 2018-02-15 20:28:05 -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
deathride58
64ec78b5de Merge pull request #5498 from Citadel-Station-13/upstream-merge-35636 
[MIRROR] Spellchecks announcement's grammar
 2018-02-16 01:26:09 +00:00
deathride58
cd28894a2f Merge pull request #5497 from Citadel-Station-13/upstream-merge-35644 
[MIRROR] Fix GLOB setup runtimes not affecting the counter
 2018-02-16 01:24:33 +00:00
deathride58
efa1f99f9d Merge pull request #5495 from Citadel-Station-13/upstream-merge-35548 
[MIRROR] Slime Radio Potion
 2018-02-16 01:12:07 +00:00
vuonojenmustaturska
002f0c41dc Merge pull request #35680 from MoreRobustThanYou/patch-60 
Fixes SCP-294 losing its top sometimes
 2018-02-15 16:24:28 -06:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
oranges
7fd53748f0 Merge pull request #35606 from coiax/hydroponic-foods-taste 
Apples now taste like apples
 2018-02-15 14:52:26 -06:00
Ashe Higgs
dc100371f3 Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies (#35131) 
🆑 Xhuis
tweak: Removing and printing integrated circuits will now attempt to place them into a free hand.
tweak: You can now hit an integrated circuit printer with an unsecured electronic assembly to recycle all of the parts in the assembly en masse.
tweak: You can now recycle empty electronic assemblies in an integrated circuit printer!
soundadd: Integrated circuit printers now have sounds for printing circuits and assemblies.
/🆑

Some low-hanging fruit for circuits. I was trying them earlier, and these were the main things that I was surprised didn't exist, so I added them. I'm not sure about the assembly manipulation yet (may have been intentional?) but it feels a lot smoother to use, especially since misprints can be emptied out and then recycled instead of awkwardly removing each component and then disposing of the case.
 2018-02-15 14:46:06 -06:00
Cruix
5005fb20c6 Added chemical reaction unit tests 2018-02-15 14:34:41 -06:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
MMMiracles
bd9ad82bbf Adds Cryostatis Shotgun Darts (#35342) 
* adds cryostatis shotgun darts, because shooting tiny water+potassium bombs into people is funny

* lowers amount from 15 to 10

* Update ammo_casings.dm
 2018-02-15 14:25:05 -06:00
AnturK
10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00
ThePainkiller
87708abd4c Fixed a typo on an eldritch god's pronunciation (#35611) 
Changed the text to get the Necronomicon. It's "Cthulhu" not "Cthulu", get it right!
 2018-02-15 10:39:55 -06:00
FrozenGuy5
efb5cd342c Spellchecks announcement's grammar (#35636) 
* no <br>

* i shall not take the risk
 2018-02-15 10:39:25 -06:00
Jordan Brown
f93365c00b Fix GLOB setup runtimes not affecting the counter (#35644) 2018-02-15 10:39:17 -06:00
Tad Hardesty
5b30b29a4b Support stations with multiple z-levels (#35339) 
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
 2018-02-15 10:39:08 -06:00
KorPhaeron
0ed0abbd4c Slime Radio Potion (#35548) 
* Slime Radio Potion

* Deletes inaccurate comment
 2018-02-15 10:38:59 -06:00
vuonojenmustaturska
e70194f329 Merge pull request #35561 from ShizCalev/rndconsole-runtime 
Fixes rnd console runtimes
 2018-02-15 10:38:49 -06:00
Chayse Ramsay
9c3c039dc1 Commenting out civilian job global init 2018-02-15 10:15:02 +00:00
Jordie
fe63a4527f Merge pull request #35660 from Iamgoofball/patch-397 
[s] Trit no longer makes radiation
 2018-02-14 19:14:14 -06:00
Poojawa
01bc7310b6 Cryopods from Oracle Station 
It's really nice to have a tg based station that's porting good shit.
 2018-02-14 14:06:33 -06:00
deathride58
a13d41a675 Merge pull request #5483 from Citadel-Station-13/upstream-merge-35579 
[MIRROR] Disables emagging Centcom Ferry
 2018-02-14 17:09:36 +00:00