Commit Graph

13163 Commits

Author SHA1 Message Date
uomo 027b294a59 Gives the Psychologist some pills. (#50211)
* Creates pill and pill bottle types for the psych, puts them in their backpack.

* Update code/game/objects/items/storage/firstaid.dm

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* Update code/game/objects/items/storage/firstaid.dm

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/pill.dm

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* Update pill.dm

Removes an unneeded blank line.

* Cleans up a needless comma and space.

* wording change for happiness bottle

Co-authored-by: trollbreeder <trollbreeder@users.noreply.github.com>
2020-03-27 16:35:07 -04:00
Arkatos1 7fb478c83b Mind Transfer is now a pointed spell (#50119)
* Mind Swap pointed spell

* Cast safety, cleanup

* Warning messages cleanup

* Autodoc

* Update code/game/objects/items/granters.dm

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

* Update code/modules/spells/spell_types/mind_transfer.dm

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

* Review fixes

* Blind range check fix

* Generic range check and cleanup

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-26 15:47:29 -03:00
Fikou a59e4fb1b5 merges civilian and service departments (#50142)
* merges the service and civilian departments

* yee haw
2020-03-26 22:05:28 +08:00
RiskySikh 32b0bda313 Adds Another Bible Sprite (#50156)
* newreligion

* resolvespritemergeconflict

* spacefix

* spacefix2

* spacefix3

* spacefix4

* fix lineendings

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-26 01:00:40 +08:00
moo 1a40fbc57d Update votingbox.dm (#50193) 2020-03-25 02:21:00 +08:00
ShizCalev 53887b9471 Merge pull request #50186 from ArcaneDefence/Vape-firestack-fix
Vape fire stack issue fix
2020-03-24 03:51:46 -04:00
ArcaneDefence 3771a93151 Don't code late at night, you miss dumb shit and make yourself look stupid
you have posted CRINGE now you will lose subscriber
2020-03-24 01:37:34 -06:00
ArcaneDefence dad1821e3a Adds a plus sign lmao 2020-03-24 01:06:58 -06:00
Fikou bac5fd01a5 adds bubblegum gum (#50026)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* adds bubblegum gum

* autodoc

* fixes fuckups

* fixes merge conflict and bad things

* nicer color

* shortens proc name

* Update code/modules/food_and_drinks/food/snacks_other.dm

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

* cringe

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-23 14:04:26 -03:00
Capsandi c04affe83c Adds deconstruction and unanchoring to sheetifier (#50014)
* notsosheetynowareya

* notsorequiringanchorageonbeingbuiltnowareya

* howdidiforgetthat

* Update code/game/machinery/sheetifier.dm

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

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-23 09:07:49 -03:00
Rob Bailey 2f127f8b95 More glowing stuff (#50109)
* vending machine framework

* wip

* all vending masks

* more glowing stuff

* dynamic unsetting of luminosity

* use define
2020-03-22 23:38:50 -03:00
gregolego 93622a9120 Adds trumpet sprites + inhands (#50124)
* Added a new sprite for the trumpet

IT'S NO LONGER A FUCKING BUGLE

WHO THE FUCK MADE A BUGLE SPRITE FOR A TRUMPET

* Finished trumpet sprite and trumpet inhands

It's no longer a fucking trombone (why was it a trombone in the first place!??)

* Added spectral trumpet and inhands

It's all animated.

All fucking animated.
2020-03-22 19:45:22 -03: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
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
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
LemonInTheDark 8746f42759 BoH modifications [headcoder orders] (#50083)
* Adds a sanity check to boh_tear process

* WHYYYYY
2020-03-21 17:09:36 +01:00
ArcaneMusic b737f267f3 you thought (#50057) 2020-03-21 17:07:30 +01: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
wesoda25 95534ff46e =^_^= (#50072) 2020-03-21 09:55:46 -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
uomo91 c60670547e Creates a psychology locker and adds it to every map. 2020-03-20 09:43:35 -05: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
Arkatos1 de4b485dd4 Assemblies, TTV and Electropack now require you to hold them i… (#49987)
* Electropack status fix

* Hands check

* Cleanup

* TTV and assemblies hands state
2020-03-20 00:25:41 -07:00
Mickyan c6b0774b86 [READY]Adds the Smooth-Headed (super bald) quirk (#49932)
* super baldness

* cleanup

* fix

* stuff

* woops

* and done

* docs, changed proc names

Co-authored-by: Unknown <Floydje123@hotmail.com>
2020-03-20 00:15:10 -07:00
Arkatos1 9bf056f7ac New spell type - Pointed spells (#49909)
* Initial commit

* Ranged Blind override version

* Pointed spells category, repath, blind icons and blind pointed spell

* Icon resize, cleanup

* Trigger bugfix

* Code cleanup

* Cast cleanup

* Refactor, easier inheritance, specific intercept checks
2020-03-20 00:12:31 -07:00
EgorDinamit 99db5b0a76 Update code/game/objects/structures/ghost_role_spawners.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 10:21:20 +04:00
Rohesie 9d4eb582ac Merge pull request #49563 from Fikou/clarke
[READY] Adds Clarke, your new mech buddy!
2020-03-19 18:29:49 -03:00
Rohesie 66b078d713 Merge pull request #49808 from ATH1909/finally
[READY] Cyborgs can finally unbuckle people from chairs
2020-03-19 17:47:55 -03:00
Fikou 6ea85d346d FIXES A COMMENT IN HIGHLANDER CLAYMORE NOT BEING IN ALL CAPS!!!! #49976
ABOUT THE PULL REQUEST

ON THE 18TH OF SEPTEMBER 2019 SPOOKYDONUT BROKE THE SACRED RULE OF HAVING ALL COMMENTS ON THE HIGHLANDER CLAYMORE BE IN ALL CAPS
I WILL FIX WHAT HAPPENED ON THIS SAD DAY WITH THIS PR
WHY ITS GOOD FOR THE GAME

WE MUST RESTORE BALANCE TO THE WORLD
2020-03-20 09:38:38 +13:00
Rohesie d74c0bfba1 Merge pull request #50012 from kingofkosmos/time_tenses_to_present
Verb time tenses to present tense
2020-03-19 16:19:49 -03:00
uomo91 1d7b95511c Merge branch 'master' into psychologist 2020-03-19 05:33:15 -05:00
ATH1909 08faf069fc Update code/game/objects/buckling.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-18 19:42:17 -05:00
ATH1909 cc9c7f9e57 Update code/game/objects/buckling.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-18 19:42:10 -05:00
Rohesie 39e5bd6c73 Merge pull request #48747 from kevinz000/movespeed_modifiers_take_two
Movespeed modifiers, take two
2020-03-18 17:29:49 -03:00
EgorDinamit 029b10a06d Merge branch 'master' of git://github.com/tgstation/tgstation 2020-03-18 19:04:21 +04:00
ShizCalev 55f8dd7e35 Merge pull request #49940 from ArcaneMusic/quickfix
Fixes a few issues with datum tables.
2020-03-17 22:28:29 -04:00
ShizCalev 4516f731b6 Merge pull request #50044 from necromanceranne/baton_fix
quick and dirty fix to classic batons
2020-03-17 21:56:37 -04:00
RiskySikh 5b66eafd66 Removes the Emag functionality from the Goat Plushie + small fixes (#50023)
* GoatPlushie

Removes emagged plushie

* GoatPlushiePart2
2020-03-17 19:54:12 -04:00
Rohesie 0209e5005f Merge pull request #50006 from Dennok/patch-15
fix for blood drips layering in openspace
2020-03-17 19:07:22 -03:00
Rohesie a6fc7f86d9 Merge pull request #50019 from TiviPlus/trenchcoat
Fixes the ablative hood
2020-03-17 18:27:43 -03:00
Tim c8bae274e3 Le docs 2020-03-17 21:58:53 +01:00