Commit Graph

13153 Commits

Author SHA1 Message Date
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
necromanceranne
cfcab7ebab quick and dirty fix to one of my mistakes 2020-03-18 07:44:35 +11:00
kevinz000
d5cd073887 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-03-17 09:48:02 -07:00
necromanceranne
12221be2b9 The Infiltrator Sneaksuit Bundle: Armor for (relatively) Cheap (#49608)
About The Pull Request

Redoing the pull request because it's changed so fucking much. Original over here #49550.

The Infiltrator Bundle is a sneaksuit set that allows the wearer the benefits of a decent armor set at a relatively low price of 6TC. The armor vest paired with the sneaksuit will equal a syndicate hardsuit, but only on the chest. It also carries none of the benefits of the hardsuit, such as EVA.

The bundle comes complete with the following items:

Infiltrator Helmet: It's a insidious helmet. Has flashproofing.
Infiltrator Vest: It's roughly equal to an armor vest, but a lot wearker against lasers and disablers.
Blood-red Sneaksuit: It's the highest armored undersuit in the game, at 10 across the board.
Infiltrator Balaclava: Equal to an explorer mask in armor, and has a diagnostic hud built in. It also distorts your voice, so you always come up as 'Unknown' when speaking, even when you have another ID on. Obviously has anti-syngery with the Agent Card, but you're not wearing this to disguise as other people.
Infiltrator Gloves: Special combat gloves that allow you to fireman carry people more quickly.
Sneakboots: They muffle your footsteps completely!
Carrying Case: Storage container for the full suit and guns if you have them. Guns not included.

Also includes the Sleepytime Pajama Bundle for nukies.

Zawo and I have been passing this between us for a while trying to get this into a good state. Hopefully now it's worth an inclusion.
Why It's Good For The Game

A cheaper alternative to the Syndicate Balloon to indicate to everyone around you that you are probably valid.

A recognizable outfit that proves to be useful in minor ways and provide cheap armor for traitors. Nothing this grants is especially powerful on it's own, but it is a useful for traitors wanting to gain an edge at low cost.
Changelog

🆑 NecromancerAnne and zawo
add: The Infiltrator Bundle, an armor kit for 6TC. Murder people in style!
add: Some pajamas for nukies to get plenty of bed rest.
/🆑
2020-03-17 20:31:31 +13:00
ShizCalev
3f9920db1a Merge pull request #49956 from Iamgoofball/comrade
Families Update 1: Preference for roles, Space Cop Ballistics, Balance Tweaks, Fixes
2020-03-17 03:23:06 -04:00
Archanial
fe70399f97 Removes major and minor crime distinction, simplifies adding a crime in sechuds (#49591)
About The Pull Request

Removes minor and major crimes to simplify them, they are just "crimes" now.
Adding a crime is now 2 1 pop-ups instead of 3.
Instead of adding details in sechuds, you can add it in sec consoles or by viewing crime in hud.
Why It's Good For The Game

My goal was to simplify adding crimes to encourage security to actually do that.
Since the space law is only a roleplay suggestion, we don't need that distinction.
Changelog

cl
del: Deleted minor and major crimes (they are just crimes now).
tweak: Adding a crime (via sec huds) is now only 1 pop-up, seriously try it.
add: You can now add crime details in security consoles.
/cl
2020-03-17 10:58:51 +13:00
Tim
818643440d fix 2020-03-16 18:05:33 +01:00
kingofkosmos
b8c35332f5 repaired --> repairs 2020-03-16 15:04:26 +02:00
kingofkosmos
79c5a80ca0 Visible_messages verb time tenses changed to present. 2020-03-16 14:55:25 +02:00
Dennok
efa9c92073 Update overlays.dm 2020-03-16 11:11:52 +02:00
Dennok
a0c43dfb10 up 2020-03-16 11:05:48 +02:00