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

5262 Commits

Author SHA1 Message Date
CitadelStationBot
e85aa903a7 [MIRROR] Readds whisky sour & hearty punch mix sounds (#5676) 
* Merge pull request #35904 from ShizCalev/mix-sounds

Readds whisky sour & hearty punch mix sounds

* Readds whisky sour & hearty punch mix sounds
 2018-02-23 19:32:41 -06:00
EtheoBoxxman
043457c9f3 Blob update (#5624) 
Ups the min players from 20 to 40 for a blob event to happen.
 2018-02-23 19:19:39 -06:00
deathride58
759444c148 Removes xeno stun and stamina immunity (#5616) 2018-02-23 19:18:52 -06:00
CitadelStationBot
567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674) 
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
 2018-02-23 17:42:57 -06:00
CitadelStationBot
4351621e7d [MIRROR] Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#5673) 
* Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)

* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells

* Enables the RPED to construct/replace beakers, igniters and bluespace crystals
 2018-02-23 17:42:24 -06:00
CitadelStationBot
d96b280383 [MIRROR] Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#5672) 
* Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#35906)

* Syringe dartguns!

* Fix wording

* And then I said, 'I fixed it all!'

* Make it 12TC

* Adds an dart-synthesizing dartgun for CMO/Chemist traitors
 2018-02-23 17:42:03 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733 
[MIRROR] [s] Cameranet fixes
 2018-02-23 13:21:23 +00:00
Chayse Ramsay
dfe187ff1c Slimepeople bugfixes and rebalancing (#5649) 
* Patching damage down to 3x to balance for Pooj's pressure damage increase

* Fixes a bug related to slime change potions

* Fixing conflict
 2018-02-22 23:48:56 -06:00
Poojawa
743b1239bb Fixes dogborg offsets and gun layering (#5668) 
* Fixes dogborg offsets.

* Fixes Dogborg laser overlays

* comment fix.
 2018-02-22 23:48:24 -06:00
CitadelStationBot
099157b8ff [MIRROR] Renames neurotoxin2 (the toxin, not the drink) (#5666) 
* fentanyl (#35882)

* Renames neurotoxin2 (the toxin, not the drink)
 2018-02-22 23:43:23 -06:00
CitadelStationBot
bc86d518db [MIRROR] Makes the detective's flask more noir-noire-noided (#5663) 
* Makes the detective more noir-noire-noided (#35878)

* Makes the detective's flask more noir-noire-noided
 2018-02-22 23:41:58 -06:00
CitadelStationBot
862a229652 [MIRROR] Removes input/output plates and their last remaining use (#5658) 
* Removes input/output plates and their last remaining use (#35800)

* - Removes input/output plates and their last remaining use

* - ok fine updates the map too

* - loco loco

* Removes input/output plates and their last remaining use
 2018-02-22 23:38:48 -06:00
cebutris
a39c0ef648 Revert "Slimes have no livers!" (#5655) 
* Revert "Automatic changelog generation for PR #5633 [ci skip]"

This reverts commit c6ad3899d4.

* Revert "Slimes have no livers! (#5633)"

This reverts commit 07c7c5e6bf.
 2018-02-22 23:38:04 -06:00
cebutris
4d1f93660f Toxin lovers properly take toxin damage from liver failure (#35901) 
* Toxin lovers properly take toxin damage from liver failiure

* Makes it forced instead of checking for toxinlover
 2018-02-22 14:43:47 -06:00
kevinz000
7e5057b99e fixes arousalloss not being a valid damage type for humans (#5654) 
* goddamnit you broke arousal

* Update species.dm
 2018-02-22 12:00:51 -06:00
cebutris
07c7c5e6bf Slimes have no livers! (#5633) 2018-02-22 01:37:32 -06:00
CitadelStationBot
3b07fc6717 [MIRROR] Ninja event 'fun' change. (#5650) 
* Ninja event 'fun' change. (#35859)

* Lower 1 hour events to 40mins

* Revert change to Slaughter demon

Waaaaaaaaa

* Revert "Revert change to Slaughter demon"

This reverts commit 92e187338367952ea00ef05b9d2f17d8ff6fb12c.

* Truly revert Slaughter Demon change

Waaaaaa

* Ninja event 'fun' change.
 2018-02-22 01:30:52 -06:00
CitadelStationBot
05fc69289a [MIRROR] Update Ninja welcome text (#5651) 
* Updates Ninja welcome text (#35863)

* Update Ninja welcome text
 2018-02-22 01:30:14 -06:00
CitadelStationBot
7586804fca [MIRROR] Remove poisoned apple (#5640) 
* Merge pull request #35820 from vuonojenmustaturska/vuonojenmustaturska-patch-2

Remove poisoned apple

* Remove poisoned apple
 2018-02-21 19:47:15 -06:00
CitadelStationBot
fc2605aaeb [MIRROR] Marauder limit fixed (#5645) 
* Merge pull request #35593 from Robustin/marauderfix2

Marauder limit fixed

* Marauder limit fixed
 2018-02-21 19:45:48 -06:00
CitadelStationBot
f1b88666ef [MIRROR] Rebalances Hearty Punch (#5643) 
* Rebalances Hearty Punch (#35836)

Changed healing rates to be more in par with Atropine but not as weak.
Increased metabolization rate.

balance: Rebalanced healing properties. Metabolization rate upped.

It still allows you to keep on fighting during duress and its combat properties have remained untouched. Also, I think it's an oversight that something with this much alcohol could heal what would be proper ethanol damage suffered from consuming what is a high amount of BAC you'll get from drinking a cocktail like this

* Rebalances Hearty Punch
 2018-02-21 19:44:37 -06:00
deathride58
4f31e42574 Merge pull request #5637 from Citadel-Station-13/upstream-merge-35845 
[MIRROR] Fixes patches runtime when applying to missing limbs.
 2018-02-21 18:16:13 +00:00
deathride58
a097ece7e0 Merge pull request #5636 from Citadel-Station-13/upstream-merge-35842 
[MIRROR] Tweaks meteor shield emag text
 2018-02-21 18:15:58 +00:00
AnturK
73928eb9c0 Fixes patches runtime when applying to missing limbs. (#35845) 
* Fixes patches runtime when applying to missing limbs.

* Some feedback.
 2018-02-21 11:41:51 -06:00
Jordan Brown
3c25171b8d Merge pull request #35842 from 81Denton/meteor-emag-text 
Tweaks meteor shield emag text
 2018-02-21 11:40:39 -06:00
81Denton
cfd768e09f Changes event earliest_start to use time helpers (#35841) 
* uses time helpers, tweaks santa/shuttle loan times

* hourS
 2018-02-21 11:38:26 -06:00
CitadelStationBot
845f21047d [MIRROR] You can now choose from ten random names in plastic surgery, and abductors can give their victims creepy subject names (#5615) 
* You can now choose from ten random names in plastic surgery, and abductors can give their victims creepy subject names

* Update plastic_surgery.dm
 2018-02-21 09:32:31 -06:00
Chayse Ramsay
863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
CitadelStationBot
af2ae3d727 [MIRROR] Reverts intercept_user_move change for flightsuits (#5630) 
* Merge pull request #35830 from vuonojenmustaturska/clientsignal

Reverts intercept_user_move change for flightsuits

* Reverts intercept_user_move change for flightsuits
 2018-02-21 09:28:53 -06:00
CitadelStationBot
fe8b463203 [MIRROR] Fixes the sensor corpse runtimes. (#5627) 
* Merge pull request #35837 from AnturK/sensorbadcode

Fixes the sensor corpse runtimes.

* Fixes the sensor corpse runtimes.
 2018-02-21 09:28:34 -06:00
CitadelStationBot
399b1c44fb [MIRROR] Revert the notify command not being admin only (#5629) 
* Merge pull request #35825 from tgstation/Cyberboss-patch-1

Revert the notify command not being admin only

* Revert the notify command not being admin only
 2018-02-21 09:28:12 -06:00
CitadelStationBot
83d1ad9e45 [MIRROR] Fixes jugg spell object damage (#5626) 
* Merge pull request #35839 from AnturK/take-code-damage

Fixes jugg spell object damage

* Fixes jugg spell object damage
 2018-02-21 09:27:50 -06:00
CitadelStationBot
54889864ab [MIRROR] Hopefully fixes gas miners (#5628) 
* Merge pull request #35828 from tgstation/Cyberboss-patch-2

Hopefully fixes gas miners

* Hopefully fixes gas miners
 2018-02-21 09:27:30 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
Poojawa
8305efd5a1 Vore preference fix + Sounds respect wall barriers (#5623) 
* various vore QoLs

* removed unused button, added the verb
 2018-02-21 00:42:11 -06:00
deathride58
a89323182f Merge pull request #5622 from Citadel-Station-13/upstream-merge-35832 
[MIRROR] Removes duplicate first death log
 2018-02-21 06:31:33 +00:00
deathride58
172459b2d8 Merge pull request #5620 from Citadel-Station-13/upstream-merge-35823 
[MIRROR] Fixes clowntears not grinding properly #35814
 2018-02-21 06:31:11 +00:00
Jordie
b031f73ef4 Removes duplicate first death log (#35832) 
* Update blackbox.dm

* Update death.dm

* Update ticker.dm
 2018-02-20 18:58:48 -06:00
Ordonis
3a1cfe9f59 Fixes #35814 (#35823) 
Ree container changes ruined my neat solution now it's less neat
reeeeeeeeeeee
 2018-02-20 17:28:12 -06:00
Ashe Higgs
08bc84d3db Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759) 
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
 2018-02-20 17:10:40 -06:00
deathride58
2ac71b3647 Merge pull request #5614 from Citadel-Station-13/upstream-merge-35838 
[MIRROR] Fixes transit runtime.
 2018-02-20 15:27:01 +00:00
deathride58
93a90664b7 Merge pull request #5613 from Citadel-Station-13/upstream-merge-35792 
[MIRROR] Fixes multiserver mining formula
 2018-02-20 15:26:49 +00:00
deathride58
d2e49dd52e Merge pull request #5612 from Citadel-Station-13/upstream-merge-35802 
[MIRROR] Fixes ore stack sprites
 2018-02-20 15:26:11 +00:00
deathride58
3779e384ec Merge pull request #5611 from Citadel-Station-13/upstream-merge-35507 
[MIRROR] [READY]NTnet circuit fix
 2018-02-20 15:25:59 +00:00
deathride58
79db3ba93d Merge pull request #5607 from Citadel-Station-13/upstream-merge-35578 
[MIRROR] Adds a debug circuitry printer, along with some assorted circuit fixes and tweaks
 2018-02-20 15:24:26 +00:00
deathride58
5b7f37da25 Merge pull request #5606 from Citadel-Station-13/upstream-merge-35582 
[MIRROR] The end-round report now shows the name, area, ckey, damage taken, and last words of the first person to die that round
 2018-02-20 15:23:50 +00:00
deathride58
0fb4a03c69 Merge pull request #5605 from Citadel-Station-13/upstream-merge-35621 
[MIRROR] Fixes noslip shoes not showing up in nuke ops uplink
 2018-02-20 15:23:34 +00:00
deathride58
d1c08b145f Merge pull request #5604 from Citadel-Station-13/upstream-merge-35633 
[MIRROR] Improves mining voucher choices and minebots
 2018-02-20 15:23:21 +00:00
deathride58
2a36977048 Merge pull request #5603 from Citadel-Station-13/upstream-merge-35710 
[MIRROR] Change-Projectile cleanup (and now you can be ANY* species)
 2018-02-20 15:22:50 +00:00
deathride58
cd19411211 Merge pull request #5602 from Citadel-Station-13/upstream-merge-35737 
[MIRROR] Italian mustache respects capital letters more
 2018-02-20 15:22:33 +00:00