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

8803 Commits

Author SHA1 Message Date
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
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
2e6efc58aa Merge pull request #5500 from Citadel-Station-13/upstream-merge-35635 
[MIRROR] Fixes the name on the cook's culinary school training
 2018-02-16 01:26:56 +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
deathride58
13dbb82e06 Merge pull request #5494 from Citadel-Station-13/upstream-merge-35561 
[MIRROR] Fixes rnd console runtimes
 2018-02-16 01:11:25 +00:00
deathride58
22398affc5 Merge pull request #5493 from Citadel-Station-13/upstream-merge-35661 
[MIRROR] Mekhi goes on the table
 2018-02-16 01:10:46 +00:00
deathride58
6802b64db7 Merge pull request #5492 from Citadel-Station-13/upstream-merge-35664 
[MIRROR] Fixes some tooltip runtimes
 2018-02-16 01:10:28 +00:00
deathride58
3dac047801 Update implanter.dm 2018-02-15 20:09:30 -05: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
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
TehZombehz
326238e59f Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:48 -06:00
Jordan Brown
1b8a0232c0 Merge pull request #35655 from ShizCalev/DOOR-LAYERING-FIX-FINALE 
fixes firedoor layer for the last god damn time
 2018-02-15 10:40:13 -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
Iamgoofball
04ec62d03d Fixes the name on the cook's culinary school training (#35635) 
Totally forgot to do this
 2018-02-15 10:39:44 -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
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
Jordan Brown
e95d3cd700 Merge pull request #35661 from MrStonedOne/patch-483 
Mekhi goes on the table
 2018-02-15 10:38:37 -06:00
Jordan Brown
7b493c30d7 Merge pull request #35664 from AnturK/tooltipruntimes 
Fixes some tooltip runtimes
 2018-02-15 10:38:27 -06:00
vuonojenmustaturska
e6487cc5ef Merge pull request #35692 from Cyberboss/GarbagePreInit 
Moves garbage up in the init order
 2018-02-15 10:38:02 -06: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
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
CitadelStationBot
44d2759921 [MIRROR] Fixes near_camera runtime (#5482) 
* Merge pull request #35624 from ShizCalev/near_camera-runtime-fix

Fixes near_camera runtime

* Fixes near_camera runtime
 2018-02-14 10:56:19 -06:00
CitadelStationBot
283a0418a3 [MIRROR] Makes the kinetic crusher's damage on examine a little more accurate (#5481) 
* Merge pull request #35617 from ChangelingRain/crusherdescfix

Makes the kinetic crusher's damage on examine a little more accurate

* Makes the kinetic crusher's damage on examine a little more accurate
 2018-02-14 10:55:47 -06:00
CitadelStationBot
e0ab141341 [MIRROR] Updates die to use the roll() proc + initialize() (#5480) 
* Merge pull request #35564 from praisenarsie/patch-29

Updates die to use the roll() proc + initialize()

* Updates die to use the roll() proc + initialize()
 2018-02-14 10:54:58 -06:00
kevinz000
1309f0a22f Disables emagging Centcom Ferry (#35579) 2018-02-14 10:19:50 -06:00
CitadelStationBot
9b4770f855 [MIRROR] Mining tools now use tool system (#5462) 
* Mining tools now use tool system

* Update hydroponics.dm
 2018-02-14 05:36:15 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
deathride58
5bf11ca6d5 Merge pull request #5477 from Citadel-Station-13/upstream-merge-35506 
[MIRROR] Assblasts some power creep in circuit labs
 2018-02-14 04:10:32 +00:00
deathride58
aa3ee6b6e2 Merge pull request #5475 from Citadel-Station-13/upstream-merge-35605 
[MIRROR] Fixes ai transform being picky
 2018-02-14 03:34:13 +00:00
deathride58
d8b3726437 Merge pull request #5474 from Citadel-Station-13/upstream-merge-35618 
[MIRROR] Fixes process_dead diseases not processing at all
 2018-02-14 03:22:34 +00:00
deathride58
04f852af24 Merge pull request #5473 from Citadel-Station-13/upstream-merge-35612 
[MIRROR] Prevents docking ports from being thrown away by chasms
 2018-02-14 03:09:52 +00:00
Dax Dupont
98c9e0948f Assblasts some power creep in circuit labs (#35506) 
* Circuit printers no longer start upgraded.

* Replaces roundstart upgraded printer with regular printer

* Replaces roundstart upgraded printer with regular printer w\ key remap
 2018-02-13 21:09:35 -06:00
deathride58
132b8cc816 Merge pull request #5472 from Citadel-Station-13/upstream-merge-35427 
[MIRROR] Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities
 2018-02-14 03:08:23 +00:00
deathride58
6be0f70bf8 Merge pull request #5471 from Citadel-Station-13/upstream-merge-35584 
[MIRROR] Greentext antag datum and OnRoundend hook.
 2018-02-14 03:02:13 +00:00
Jordan Brown
807a2ebaeb Merge pull request #35605 from MrStonedOne/patch-481 
Fixes ai transform being picky
 2018-02-13 21:00:05 -06:00
Jordan Brown
da5cc6a8cc Merge pull request #35618 from YPOQ/processdeaddiseasefix 
Fixes process_dead diseases not processing at all
 2018-02-13 20:58:48 -06:00
Jordan Brown
70f90f8252 Merge pull request #35612 from vuonojenmustaturska/vuonojenmustaturska-patch-1 
Prevents docking ports from being thrown away by chasms
 2018-02-13 20:57:35 -06:00
ExcessiveUseOfCobblestone
745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427) 
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
 2018-02-13 20:47:14 -06:00
AnturK
38145c93c7 Greentext antag datum and OnRoundend hook. (#35584) 
* Greentext antag datum and OnRoundend hook.

* review stuff
 2018-02-13 19:43:54 -06:00