Commit Graph

51089 Commits

Author SHA1 Message Date
RiskySikh
9bca49ccee Higadrite Metabolization Fix (#49951)
* GoatPlushie

Removes emagged plushie

* Revert "GoatPlushie"

This reverts commit f4395c4afdeb55c959cd1716eadc37ef2ff0c809.

* higadritemetabolizingfix

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-03-22 18:03:54 -04:00
Rohesie
906d6f3d24 [READY] Fireman carry QoL changes (#49733)
* Fireman carry

* Change requests.

* doc
2020-03-22 18:00:56 -04:00
Mickyan
aee54c56c5 Adds space carp taming and a new bundle for the curator: the carp hunter (#50020)
* fish friends

* fish pals

* fish pals

* dumb

* hunting knife now is useful

* hunting knife now has a sprite

* FUCK

* inhand

* rohesie reviews

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-03-21 21:11:11 -03:00
81Denton
55dc380d70 Merge pull request #50139 from uomo91/psychaccessfix
Fix psych access being left out of minimal_access for the HoP & CMO
2020-03-22 01:01:24 +01:00
IndieanaJones
e99b50a7d5 [READY] Reworks the Venus Human Trap (#49736)
* Update venus_human_trap.dm

* Update venus_human_trap.dm

* Update spacevine.dm

* Update venus_human_trap.dm

* Update language_holder.dm

* Update venus_human_trap.dm

* Update spacevine.dm

* Update code/modules/events/spacevine.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Appease the Great Circular One

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update venus_human_trap.dm

* Fix Spacing

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-21 20:51:50 -03:00
Dennok
1feaefa813 Autoclose airlocks on power on. (#50115)
* Autoclose airlocks on power on.

* Update code/game/machinery/doors/door.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-21 20:50:11 -03:00
Aleksej Komarov
97c90932e1 tgui: ByondUi, Cam Console (#49960)
* ByondUi, Cam Console

* Remove todos

* Rebuild tgui

* Poltergeist fix

* Clean up imports in CameraConsole

* More cleanup

* Rebuild tgui

* Address reviews, optimize camera code

* CRASH instead of stack_trace

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Micro manage that code to death

* Prefer to perform the operations first on Destroy()

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Typecast in get_bbox_of_atoms, skip ismob() check

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-21 20:45:21 -03:00
uomo91
252c6feca9 Fixes psychology access being left out of minimal_access for the HoP and CMO. 2020-03-21 17:44:59 -05:00
wesoda25
d463524ac8 gloves (#50101) 2020-03-21 18:18:13 -03:00
81Denton
45917da07a Merge pull request #49964 from uomo91/psychologist
Psychologist
2020-03-21 21:37:05 +01:00
EgorDinamit
da3cdd8169 [Ready] Syndicate Forgotten Ship ruin. Balance+Bug fix. (#50120)
* Balance+Bug fix.

* Update forgottenship.dmm

* Update forgottenship.dmm

* Removes rogue table

* Give uranium to plebs.

* Beakers+Few chameleon stuff

* Fluff text rebalance. Allow people to leave the ship as long as it is protected.

* Grammar fix, I guess

* Le grammar

* Replaced interrogation room with medbay. Added tactical medkit(1) to med-vendor and 5 basic medkits to the same vendor. Additional ores, loot.

* Surgery disk update

* O2 canisters to maints area

* GPS signal

* Update code/game/objects/structures/ghost_role_spawners.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-21 16:59:22 -03:00
XDTM
0e397ae7fb Adds a customizable "seed" to posibrains to tell ghosts what the posibrain will be used for (#49813)
* Adds a customizable "seed" to posibrains to tell ghosts what the posibrain will be used for

* Update posibrain.dm

* reduce max length and input feedback
2020-03-21 12:57:28 -04:00
bobubeu
4b28b7fe8c Adds strawberry ice cream sandwiches (#50065)
* Adds a new frozen food

A strawberry ice cream sandwich

* Typo in consumable

* adds space in between ice cream
2020-03-21 17:26:31 +01:00
Fikou
0e7ad7c237 moves a bunch of robotics related tech nodes around (#50082)
* moves a bunch of robotics related tech nodes around

* minor fuckup
2020-03-21 17:18:24 +01:00
wesoda25
8f62bf5405 Ethereals can no longer spam drain power sources//minor powersource drain time tweaks (#50084)
* finally!

* forgot this
2020-03-21 17:15:42 +01:00
Arkatos1
8538bc36e7 Removal of slime and elite huds (#50096) 2020-03-21 17:13:23 +01:00
necromanceranne
0044136ddb fixes the hud not being removed (#50111) 2020-03-21 17:11:08 +01:00
LemonInTheDark
8746f42759 BoH modifications [headcoder orders] (#50083)
* Adds a sanity check to boh_tear process

* WHYYYYY
2020-03-21 17:09:36 +01:00
wesoda25
eb2932a079 bam bam pow (#50074) 2020-03-21 17:07:58 +01:00
ArcaneMusic
b737f267f3 you thought (#50057) 2020-03-21 17:07:30 +01:00
Rohesie
0cf8f7cd9d Dynamic current_players lists rework (#50013)
* current player lists

* Docs
2020-03-21 17:05:13 +01:00
Rohesie
e36475e1f4 Slowdown fixes and tweaks (#50095)
* Slowdowns

* Highlander fix
2020-03-21 17:01:34 +01:00
81Denton
b7e7e31cd4 Adds logging for shuttle loan events (#50114)
* Adds logging for shuttle loan events

* dent headed commits

Co-authored-by: Denton <d@ent.on>
2020-03-21 10:31:43 -03:00
RiskySikh
3ed253dcf3 grammarfix2 (#50107) 2020-03-21 10:30:17 -03:00
ArcaneMusic
d68ea7748e Improves the feedback on vend-a-trays. (#50061) 2020-03-21 10:18:06 -03:00
gregolego
04529469c0 Minor map fixes (#50086)
* Minor map fixes part 1

Donut:
- Gave geneticist medical access on donut
- Geneticist can now use genetics maint and South genetic door
- Replaced genetics door with glass door (for aesthetics)

Meta:
- Fixed cell 3 door/timer being linked to cell 2. Now cell 3 is independent from cell 2.

Bar bluespace shelter:
- Gave mining access to bar area (it's sort of redundant otherwise)

* Minor map fixes part 2

- Added "purge" AI module to risky AI module spawner
- Added "reset" AI module to AI chamber on donut

* Fixed trailing newline
2020-03-21 10:13:00 -03:00
Qustinnus
26b40f5478 fixies (#50068) 2020-03-21 10:00:28 -03:00
Eskjjlj
634a39430f Harm intent check and defib check (#50059) 2020-03-21 09:57:01 -03:00
wesoda25
95534ff46e =^_^= (#50072) 2020-03-21 09:55:46 -03:00
Arkatos1
b4cdb87115 Screen icons cleanup (#50089) 2020-03-21 09:53:03 -03:00
nemvar
6ce3d4d26f You no longer blugeon railings when unanchoring them. (#50090)
* No bludgeon railings no more

* autodoc
2020-03-21 09:48:50 -03:00
nemvar
f6bb710cc9 renames wet leather to wet hide (#50092) 2020-03-21 09:47:58 -03:00
nemvar
3883f6200d Fixes rolling paper (#50091) 2020-03-21 09:47:24 -03:00
nemvar
6fd8240e17 Fixes critter crates (#50093)
* critter crates no longer disappear

* critter crates actually no longer disappear.
2020-03-21 09:46:45 -03:00
ArcaneDefence
946255412a Adds a suicide to moth plushies (#49878)
* Adds a suicide to moth plushies

The user gets stripped and dusted, adding one to a kill counter

* Adds hellbound check shame state

* Attempts to meet expectations

Adds doc for var/suicide_count, var/divine, removes the shame results, replaces the theme of soul-eating with consuming/killing the user, removes the do_after, and puts the death proc in the dust proc after the unequip so that the plushie doesn't spam the squeak sound for every item the user was wearing.

* Accepting reality for what it is

* Method to prevent squeak spam

* Changes as suggested
2020-03-20 19:08:16 -04:00
Ghilker
e7a22853f7 Addition of Freon (no removal, no fire) (#49821)
* Just freon addition, no removal nor fire. Maybe unbalanced

* fixes

* material properties addition, removed from the object itself

* added admin and game logging to hot ice

* Typos

* made the component more generic

* other typos, some fixes

* typos and balancing

* better code readability

* dunno

* merge error and travis build errors fixes

* asked changes, fixes and balancing
2020-03-20 19:08:50 -03:00
Fikou
07fcd46abc adds wizard gloves (#49947)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* adds wizard gloves

* uh oh, mergie conflicties!

Co-authored-by: Changelogs <action@github.com>
2020-03-20 17:56:28 -03:00
RiskySikh
9d111bc4df Adds Lean Recipe (#50029)
Lean

* morphinedosagefix

* tastefix

* comment

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 17:06:05 -03:00
RiskySikh
56979cb0c5 Adds Cannoli (#49985)
* GoatPlushie

Removes emagged plushie

* Revert "GoatPlushie"

This reverts commit f4395c4afdeb55c959cd1716eadc37ef2ff0c809.

* Cannoli
2020-03-20 13:00:37 -03:00
uomo91
c60670547e Creates a psychology locker and adds it to every map. 2020-03-20 09:43:35 -05:00
Rohesie
91477076ac Merge pull request #50060 from mrhugo13/sonicandknuckles
Adds emote to crack your knuckles.
2020-03-20 10:11:28 -03:00
Unknown
e7a60f3d4b roh said these were not needed 2020-03-20 13:59:35 +01:00
Unknown
a5a3a42119 asdf1 2020-03-20 13:48:09 +01:00
Unknown
7fdfa52ceb god damnit this game is driving me mad 2020-03-20 13:37:32 +01:00
Rohesie
63d1327c5f Merge pull request #49349 from EgorDinamit/master
[READY]Adds new Space Ruin with ghost roles.
2020-03-20 05:24:56 -03:00
Bobbahbrown
fdcbc8cd83 Adds Configurable Living Time Requirement to Discord Auto Enrollment (#50052)
About The Pull Request

As requested by oranges this enforces a requirement, when configured, that a player must have a certain amount of living playtime in hours to auto-enroll into a discord role.
Why It's Good For The Game

Removes discord moderation requirement
Changelog

cl bobbahbrown
server: Discord role auto enrollment can now be configured to require a certain number of living hours.
/cl
2020-03-20 21:09:16 +13:00
EgorDinamit
4d7140f09e Merge branch 'master' of https://github.com/EgorDinamit/tgstation-1 2020-03-20 11:58:03 +04:00
ArcaneDefence
4dd4d0e6f6 Abductor console exploit fix (#50050)
* Cooldown vars

* Changes how the cooldown is determined

* Further change as requested

* Continued changes
2020-03-20 00:52:07 -07:00
EgorDinamit
8522ac6779 Merge branch 'master' of git://github.com/tgstation/tgstation 2020-03-20 11:51:56 +04:00
ArcaneMusic
0e7eb95e06 Extinguished burning clothes no longer burn forever. (#50062)
* Smouldering clothes can now manually be extinguished.

* Extra safety on mob overlays.

* moves overlay cutting to carbon.dm

* Check check.
2020-03-20 00:45:23 -07:00