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

9073 Commits

Author SHA1 Message Date
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
deathride58 cee4822b2a Merge pull request #5609 from Citadel-Station-13/upstream-merge-35436 
[MIRROR] Adds several new phobias
 2018-02-20 15:25:19 +00:00
deathride58 89e5028452 Merge pull request #5608 from Citadel-Station-13/upstream-merge-35547 
[MIRROR] [READY] Ctrl-clicking mobs is consistent in that it upgrades grabs
 2018-02-20 15:24:51 +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
deathride58 a5d9fc4ddd Merge pull request #5601 from Citadel-Station-13/upstream-merge-35740 
[MIRROR] Fixes mushroom bowls
 2018-02-20 15:21:59 +00:00
deathride58 c9d36d7ec8 Merge pull request #5600 from Citadel-Station-13/upstream-merge-35780 
[MIRROR] Fixed instant summon behavior with simple animals
 2018-02-20 15:21:39 +00:00
deathride58 77f48a3ceb Merge pull request #5599 from Citadel-Station-13/upstream-merge-35782 
[MIRROR] Fixed mutate not removing its effects when refunded
 2018-02-20 15:21:16 +00:00
deathride58 e70ba8d322 Merge pull request #5598 from Citadel-Station-13/upstream-merge-35793 
[MIRROR] Fixes up foam and smoke code and comments again to atleast be correct
 2018-02-20 15:20:51 +00:00
deathride58 940351b8de Merge pull request #5597 from Citadel-Station-13/upstream-merge-35804 
[MIRROR] Fixes ghost role spawners still showing up in the spawner menu even if they're deleted
 2018-02-20 15:20:28 +00:00
deathride58 11174ef300 Merge pull request #5596 from Citadel-Station-13/upstream-merge-35805 
[MIRROR] Fixes walls under doors breaking to space
 2018-02-20 15:20:01 +00:00
vuonojenmustaturska 4a65d8feeb Merge pull request #35838 from AnturK/imdumb 
Fixes transit runtime.
 2018-02-20 04:11:15 -06:00
Jordan Brown c36f144d9e Merge pull request #35792 from DaedalusGame/bitconnect 
Fixes multiserver mining formula
 2018-02-19 22:09:55 -06:00
vuonojenmustaturska 507a481a40 Fixes ore stack sprites (#35802) 
* Fixes ore sprites

* Update ores_coins.dm
 2018-02-19 22:09:46 -06:00
oranges 950d18c8db Merge pull request #35507 from arsserpentarium/ntnetfix 
[READY]NTnet circuit fix
 2018-02-19 22:09:35 -06:00
Dax Dupont 4f5dd83be9 Adds tutorial holopads for the hazard course. (#35464) 
* Hazard Course

* Hello, and welcome to the Black Mesa Hazard Course, where you'll be trained in the use of a Hazardous Environment Suit.

* Ain't no grave
 2018-02-19 22:09:26 -06:00