shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,489 Commits 5 Branches 0 Tags
b11e600cff1cf8d2e73f2f110a787dba4df8756a
Commit Graph

10392 Commits

Author SHA1 Message Date
CitadelStationBot
556961c08b [MIRROR] Fixes players killing themselves by whispering inside clone pods (#5662) 
* shut the fuck up donnie you're out of your element (#35875)

* Fixes players killing themselves by whispering inside clone pods
 2018-02-22 23:40:50 -06:00
CitadelStationBot
2809f4e694 [MIRROR] Admin-only extended AND speedy versions of revs (#5661) 
* Admin-only extended AND speedy versions of revs (#35873)

* extendedrevs

* honk

* add speedy revs, testing

* nit

* Admin-only extended AND speedy versions of revs
 2018-02-22 23:40:19 -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
LetterJay
2ca33636d1 Merge pull request #5657 from Citadel-Station-13/upstream-merge-35901 
[MIRROR] Toxin lovers properly take toxin damage from liver failure
 2018-02-22 23:16:36 -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
Buggy123
eaab8a687c tabling people on brass tables makes a clanging sound (#35876) 
* tabling people on brass tables makes a sound

* fixes syntax

* more syntax fixes
 2018-02-22 14:32:25 -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
da690f3e07 [MIRROR] Adds five second cooldown to morgue tray beeps (#5652) 
* Adds five second cooldown to morgue tray beeps (#35818)

* Adds five second cooldown to morgue tray beeps
 2018-02-22 01:37:06 -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
af34232b1a [MIRROR] Adds techweb doppler arrays and fixes their name/desc (#5653) 
* adds techweb doppler arrays, fixes techweb desc/name (#35846)

* Adds techweb doppler arrays and fixes their name/desc
 2018-02-22 01:29:26 -06:00
CitadelStationBot
23b98e4e52 [MIRROR] Holopads have a special animation for an unanswered incoming call (#5644) 
* Holopads have a special animation for an unanswered incoming call (#35391)

* Holopads have a special animation for an unanswered incoming call

🆑 coiax
add: Holopads now flash a green line when there is an incoming call.
/🆑

* Holopads have a special animation for an unanswered incoming call
 2018-02-21 19:48:10 -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
21a9d4bca4 [MIRROR] [READY]Astar improvement (#5646) 
* [READY]Astar improvement (#34713)

Improvements to A* via using bitflags to find directions and caching already checked directions so we don't recheck them.

* [READY]Astar improvement
 2018-02-21 19:46:54 -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
359a500e79 [MIRROR] New Donkpocket Box (#5641) 
* New Donkpocket Box (#35835)

cl Jittai / ChuckTheSheep
imageadd: NT has stopped buying re-boxed storebrand Donkpockets and now stocks stations with real, genuine, tasty Donkpockets!
/cl

RIP: #35601
I was asked to throw together some icons for donk baggies, but had some fun making the box.

* New Donkpocket Box
 2018-02-21 19:45:23 -06:00
CitadelStationBot
c10a4184ce [MIRROR] Makes it more apparent that >>>>>>>YOU CAN ALT CLICK TO DISABLE MORGUE TRAY BEEPING<<<<<< (#5642) 
* Makes the morgue beep disable step clearer

cl
tweak: Nanotrasen has begun a campaign to inform their employees that you can alt-click to disable morgue tray beeping.
/cl

If its annoying you literally just alt-click to disable it. There's basically no situation where you would be able to hear it without being able to turn it off, except maybe the one morgue tray in the brig if you don't have access to the windoor (but just fucking ask sec to disable it).

* Makes it more apparent that >>>>>>>YOU CAN ALT CLICK TO DISABLE MORGUE TRAY BEEPING<<<<<<
 2018-02-21 19:44:58 -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
CitadelStationBot
03dfbe7137 [MIRROR] Ports Barometers from Yogstation (#5647) 
* Ports Barometers from Yogstation (#35730)

* Ports Barometers from Yogstation

* Ports Barometers from Yogstation

* Added missing barometer_predictable bools

* Gives the atmos analyzer love instead of a new item.

* Moves playsound under cooldown to prevent soundspam.

* Ports Barometers from Yogstation
 2018-02-21 19:44:20 -06:00
CitadelStationBot
530f060c77 [MIRROR] Fixes windoors dropping extra cable (#5648) 
* Merge pull request #35857 from Repukan/TWOCABLES

Fixes windoors dropping extra cable

* Fixes windoors dropping extra cable
 2018-02-21 19:43:56 -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
deathride58
e072989b5b Update security_levels.dm 2018-02-21 13:12:50 -05:00
deathride58
cc334136f4 Update lighting.dm 2018-02-21 13:08:05 -05:00
deathride58
4608244c87 Update fakedeath.dm 2018-02-21 13:06:07 -05:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06: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
182ec24fa2 Merge pull request #5610 from Citadel-Station-13/upstream-merge-35464 
[MIRROR] Adds tutorial holopads for the hazard course.
 2018-02-20 15:25:45 +00:00