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

8934 Commits

Author SHA1 Message Date
CitadelStationBot
c3f7fb219d [MIRROR] Makes the watcher wing crusher trophy less effective (#5573) 
* Makes the watcher wing crusher trophy less effective

* Makes the watcher wing crusher trophy less effective
 2018-02-18 17:40:00 -06:00
CitadelStationBot
cdd8e1e590 [MIRROR] Removes one dotty boi (#5575) 
* Removes one dotty boi

* Removes one dotty boi
 2018-02-18 17:39:37 -06:00
deathride58
9bb0f20467 Merge pull request #5570 from Citadel-Station-13/upstream-merge-35738 
[MIRROR] MMIs can now whisper without talking on the radio
 2018-02-18 23:31:00 +00:00
deathride58
316cfb3ab4 Merge pull request #5569 from Citadel-Station-13/upstream-merge-35756 
[MIRROR] [s] makes chemical mob spawning log
 2018-02-18 23:30:33 +00:00
deathride58
12e8ca50b3 Merge pull request #5568 from Citadel-Station-13/upstream-merge-35746 
[MIRROR] Actually fixes SCP 294 overlay problems
 2018-02-18 23:30:20 +00:00
deathride58
c913ca262a Merge pull request #5567 from Citadel-Station-13/upstream-merge-35751 
[MIRROR] Crew pinpointers now fit on medical belts
 2018-02-18 23:30:07 +00:00
deathride58
51ee7ae43b Merge pull request #5566 from Citadel-Station-13/upstream-merge-35581 
[MIRROR] Newliquors
 2018-02-18 23:29:54 +00:00
deathride58
96ab8e0161 Merge pull request #5565 from Citadel-Station-13/upstream-merge-35762 
[MIRROR] fixes some stuff in flametrowers
 2018-02-18 23:29:17 +00:00
deathride58
f35f20b0a1 Merge pull request #5563 from Citadel-Station-13/upstream-merge-35764 
[MIRROR] RPED and crew pinpointer module upgrades for engi/medical borgs
 2018-02-18 23:28:13 +00:00
deathride58
73ab0e7236 Merge pull request #5562 from Citadel-Station-13/upstream-merge-35763 
[MIRROR] Removes unnused random event
 2018-02-18 23:27:40 +00:00
deathride58
822394f807 Merge pull request #5561 from Citadel-Station-13/upstream-merge-35761 
[MIRROR] improves radio code by fixing english
 2018-02-18 23:27:27 +00:00
deathride58
2651ff89d7 Merge pull request #5560 from Poojawa/snouts-and-things 
Fixes some sprite issues
 2018-02-18 23:27:08 +00:00
coiax
78803f01a6 MMIs can now whisper without talking on the radio (#35738) 
* MMIs can now whisper without talking on the radio

Fixes #35638.

* Otherwise, call super
 2018-02-18 11:34:12 -06:00
kevinz000
a1074d361e [s] makes chemical mob spawning log (#35756) 
* Rudimentary logging

* Update recipes.dm
 2018-02-18 11:34:04 -06:00
vuonojenmustaturska
cfdcabfe12 Merge pull request #35746 from MoreRobustThanYou/patch-60 
Actually fixes SCP 294 overlay problems
 2018-02-18 11:33:55 -06:00
vuonojenmustaturska
6ed9b30987 Merge pull request #35751 from Xhuis/crewpointer 
Crew pinpointers now fit on medical belts
 2018-02-18 11:33:47 -06:00
Ordonis
1094e5b69e Newliquors (#35581) 
* Adds a few new liqueurs and cocktails

How the fuck in THIS game of all games do we not have Triple Sec.
SERIOUSLY.

* Well there goes a one commit clean PR rip me

reeeeee

* Adds sounds, fixes colors

* Fixes recipies giving eggnog

Don't ask

* Adds space where space should be

* Travis stop stalling reeeeeee

* Fixes spelling mistakes

* Adds some health benefits to sec drinks.

Quadruple sec is mild, but easy to make; quintuple sec is STRONG but
more difficult.

* Fixes merge conflict annoyance

* FUCK

* Updates boozepwr of Quadruple/Quintuple sec

If someone ever adds sex on the beach as a cocktail, I fully expect them
to add in Sex-tuple Sec as well.

* Makes clowntears reagent explicit within food_reagents

Removed hacky solution, introduced better one
 2018-02-18 11:33:37 -06:00
Tlaltecuhtli
db8eb22b63 fixes some stuff in flametrowers (#35762) 
* fixes some stuff in flametrowers

* updates admin.txt
 2018-02-18 11:33:29 -06:00
vuonojenmustaturska
d4eab2acae borgmods 2018-02-18 11:33:12 -06:00
Leo
f11a74e6f3 Removes unnused random event 2018-02-18 11:33:03 -06:00
Tlaltecuhtli
2d9eb9202c improves radio code by fixing english 
wow
 2018-02-18 11:32:52 -06:00
Poojawa
d154a302e1 Sergals don't actually have an extra snout layer 2018-02-18 06:49:30 -06:00
Poojawa
d2d1315b13 fixes shepards, adjusts fox markings 2018-02-18 06:41:14 -06:00
Poojawa
3255bfbdbf sergal head stuffs 
husky markings too
 2018-02-18 04:48:02 -06:00
Chayse Ramsay
0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
Zna12
1585de0687 [Ready to merge] Au-toy-lathe (#5534) 
* Autoylathe Complete.

All the errors with the autoylathe should be fixed for now

* Toylathe Tweaking and plastic's initializing.

Well, this gets plastics halfway there. The toylathe now has 8 categories to choose from and some other sutff. It's all coming back.

* TOY LATHE NOW ACCEPTING PLASTIC

TOYLATHE IS WORKING AND RUNNING PROPERLY. SOME GUNS HAVE BEEN ADDED AND WILL NEED MORE TIME TO ADD MORE GUNS.

* Toy Datum construction.

Building some datums for the toys for the autoylathe to print.

* Toys toys toys

Adding toys to the list woo

* Autoylathe complete.

Holy shit it's fucking done.

* Fixes a duplicate id.

Also adds some shit to the hacked list.

* Okay this shit needs to stop

Rogue indentations? Nani?

* ugh

fuck

* Rogue indents

* Power issues

Fixes power scaling and the draining an APC

* Rogue File deletion.

Part of an early experiment that didn't work out.

* Some other tweaks and shit

Moves datums to the autoylathe designs and also fixes a dumb mistake I made.

* Clamps?

Added a clamp. Who knew?

* Shit.

Won't compile if it keeps looking for a file that doesn't exist

* Woops

Deleted a line not paying attention

* reworked initialize

I think I did this right.

* Revert "reworked initialize"

This reverts commit 649c156baebd64b6cd84e95f2f4c3cbd70dabce7.

* Odd variables that don't have any other references in the coding.

Why are these even here? Seriously.

* UNUSED VARIABLE?!

NANI?! Deleted. Don't need em.
 2018-02-17 17:18:22 -08:00
deathride58
1447d4106f Merge pull request #5507 from Citadel-Station-13/upstream-merge-35478 
[MIRROR] Added chemical reaction unit tests
 2018-02-18 00:56:37 +00:00
LetterJay
641af8166b Merge pull request #5452 from cebutris/crazycatgirls 
Adds in special fluff items for TechnicalMagi
 2018-02-17 18:45:27 -06:00
Poojawa
d85116abe7 fixes travis 2018-02-17 18:10:21 -06:00
Poojawa
c0850044a7 Flightsuit Armor adjustments (#5515) 
* armor tweaks

* marks the nerfs for future generations to respect.

* Modularizes values

flags are still getting trimmed tho.

* reee
 2018-02-17 18:05:26 -06:00
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551) 
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
 2018-02-17 18:04:28 -06:00
CitadelStationBot
b3266870a6 [MIRROR] Fixes some tool interactions (#5555) 
* Merge pull request #35724 from DaxDupont/bordlisten-loves-the-cocks

Fixes some tool interactions

* Fixes some tool interactions
 2018-02-17 17:46:46 -06:00
CitadelStationBot
7c036d7ca1 [MIRROR] Select Equipment works on observers (#5554) 
* Merge pull request #35728 from coiax/select-equipment-on-ghosts

Select Equipment works on observers

* Select Equipment works on observers
 2018-02-17 17:46:36 -06:00
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
fc041fbb34 Merge pull request #5549 from Citadel-Station-13/upstream-merge-35732 
[MIRROR] fixes poddoor examine message
 2018-02-17 19:31:47 +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
yorii
f03905ebde fixes poddoor examine message (#35732) 
examining a blast door do longer gives the regular door examination about the maintenance panel.
 2018-02-17 13:16:53 -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
c4d5dd34a3 Merge pull request #5548 from Citadel-Station-13/upstream-merge-35705 
[MIRROR] Fixes lava burning unconstructed HE-pipes
 2018-02-17 11:49:49 -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
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