Commit Graph

24171 Commits

Author SHA1 Message Date
William Wallace
c688bc39f7 remove duplicate var from /obj/structure/closet/cardboard 2019-10-08 23:25:38 +01:00
William Wallace
ea39325ec5 remove duplicate var in /obj/structure/flora/rock/jungle 2019-10-08 23:24:28 +01:00
William Wallace
b59c809bd5 remove duplicate var definition in /obj/item/storage/toolbox 2019-10-08 23:23:09 +01:00
William Wallace
d83ac45514 remove duplicate /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle 2019-10-08 23:22:03 +01:00
William Wallace
8221f6de87 remove duplicate var definition in /obj/item/stack/sheet/paperframes 2019-10-08 23:20:33 +01:00
William Wallace
15e5d098af rename dupe icon_state on /obj/item/stack/sheet/animalhide/monkey to item_state (still does not exist) 2019-10-08 23:19:12 +01:00
William Wallace
7f702163f4 remove duplicate var definition in /obj/item/pneumatic_cannon/ghetto 2019-10-08 23:15:32 +01:00
William Wallace
84808b77c4 remove duplicate var definition in /obj/item/toy/plush/slimeplushie 2019-10-08 23:13:32 +01:00
William Wallace
58ebaf07e9 remove duplicate var definition in /obj/structure/checkoutmachine 2019-10-08 23:11:01 +01:00
William Wallace
e8a0b723de stray /obj/effect/turf_decal/trimline/brown/filled/end -> /obj/effect/turf_decal/trimline/neutral/filled/end 2019-10-08 23:09:04 +01:00
William Wallace
00a29087d5 remove duplication var definition in /obj/effect/decal/cleanable/blood/tracks 2019-10-08 23:01:20 +01:00
William Wallace
6b13eeac45 remove duplication definitions in /obj/mecha/working/ripley/deathripley 2019-10-08 22:52:10 +01:00
William Wallace
7412197317 remove duplicate definition of /area/vacant_room's icon_state var 2019-10-08 22:49:05 +01:00
William Wallace
42904e74b4 remove duplicate /obj/item/circuitboard/machine/protolathe/department definition 2019-10-08 22:23:40 +01:00
William Wallace
7017b98d60 remove duplicate /obj/item/circuitboard/machine/protolathe definition 2019-10-08 22:23:00 +01:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
Mickyan
1e6e9c9440 Adds drip-feeding mode for the iv drip (#46845)
* drip feed

* verb to altclick
2019-10-07 16:13:40 -04:00
kingofkosmos
71644568b5 Personal interaction messages to simple animals (#46744)
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.

* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.

* Small extra: Adds personal messages for gun firing.

* Adds personal messages to grabs and fixes shoe stealing messages.

* Fixes open someone else's internals valve pronoun.

* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
2019-10-07 21:18:42 +02:00
spessbandit
87e3687bf2 Adds custom arcade game text for Halloween and Christmas. (#46795)
* Adds special arcade enemies for Halloween and Christmas. Moves arcade stuff to json file in preparation to add more eventually.

* adds custom weaponry

* fixes bug
2019-10-07 12:17:11 -04:00
carlarctg
d6210b95ce Adds fireproof masks, and tweaks flameproof atmos clothing (#46732)
* the masks

* the startups

* more touchies

* whoops

* actually this is useless

* that's better

* i made a whoopsie boopsie

* bullying is not okay

* should stop coding at 2 am, but i am being a hypcrite now
2019-10-07 10:55:22 -04:00
AnturK
d6477a1757 Fix arena controller topic (#46904) 2019-10-06 17:39:11 -07:00
Rob Bailey
b4c34c8b58 Tabling Rework (#46383)
* nutable

* more damage

* halved time

* louder + slightly different sound

* head slam + nerfed table damage

* martial art breaks table + headsmash damages table

* stamina boost to headsmash

* functional table crushing
2019-10-06 19:26:12 -04:00
Bobbahbrown
02c5751e3c Add galaxy lawyer suit (#46860)
Ports the corporate liaison galaxy suit from TGMC. Requested by 
Grantteen. Object sprites by Twaticus.

Washing a lawyer suit with a bluespace crystal or a telecrystal will 
dye the suit into an exciting galaxy suit variant. This also adds the 
DYE_SYNDICATE dye key to telecrystals, could be used for future PRs.
2019-10-06 11:46:41 -07:00
nemvar
a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
skoglol
46b68598d3 Some KS13 improvements (#46879)
About The Pull Request

Having observed a bit of how people play the derelict drones after #45965, I got a few additions and changes to the derelict to make it more enjoyable.

    Power cable into the AI core/vault area was hard to find under an rwall, have run an additional one into the room to give easier access to pre-smes power.
    Added a derelict drone printer, so more friends can be printed. Starts without materials
    Added mother drone core lawset to secure storage. This was intended in the last PR, but forgotten.
    Added a dronespeak manual that drones can use to teach other drones or silicons the drone language. Works like the codespeak manual.

Why It's Good For The Game

KS13 is frequently made great again.
Changelog

cl Skoglol
tweak: Slight mapping improvement to KS13
add: KS13 now has mother drone board, a dronespeak granter and a drone printer.
/cl
2019-10-06 22:36:55 +13:00
YoYoBatty
9d84f4890b Indestructible objects don't explode from tesla (#46895)
Title. Prevents indestructible objects such as turret controller and authentication keys from exploding dozens of times from a tesloose.

Could also stop lag and unintended deletion of objects not meant to be deleted such as the self destruct terminal.
2019-10-06 22:35:18 +13:00
MacBlaze1
3000418c4d Lenturi slowdown healing itchiyuri replacement chem (#46546)
* slowdown burn damage healing

Heals burn damage by the amount of slowdown you have. Every damage over 40 / 25 basically

* small indentation fix

* Update cat2_medicine_reagents.dm

* fixed undefines

* Update medical.dm

* adds sanity slowdown healing

more insane, more healing

* slowdown healing

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm

* oops what an idiot i am

* design changes

* Update cat2_medicine_reagents.dm

* oops

* organ damage at the end of use

* merge conflict fix #1

* stomach damage from 2 to 0.5

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm
2019-10-06 01:46:55 -04:00
carlarctg
88c6761316 Crayons have powder back, but it doesn't color anymore (#46715)
* cray

* things gatrg yrty rthh

* things fixed

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

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

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

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

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

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-10-06 01:38:16 -04:00
Twaticus
70b68366e4 More Carpets & Tables (#46850)
Ports carpets from TauCetiStation
Original PR: TauCetiStation/TauCetiClassic#2989
Adds tables to match the carpets

Carpets Good. Tables Good.
Changelog

cl
imageadd: 8 new carpets and fancy tables
add: exotic carpet crate
/cl
2019-10-06 18:09:16 +13:00
Qustinnus
26a95ac867 Re-adds room beauty without the negative moodlets (#46848)
* re-add

* epic

* fix

* epic
2019-10-05 22:47:49 -04:00
James
f6b9818d23 Fix plasmaglass shards not welding to plasmaglass (#46859) 2019-10-05 13:35:02 -07:00
81Denton
878270feaf Stop CRAB-17 spawning in engine, incinerator, solars, etc. (#46849) 2019-10-05 13:32:41 -07:00
Fikou
a191ceab07 Prevent soulstones from absorbing things with no soul (#46881)
soulstones now cant absorb things with no soul or devils.
things with no soul:
- wizard after using lich or soultap
- people that sold their soul to devil

it ruins the revival mechanics of both antags and also makes no sense 
in the lore, how can a soul shard capture a nonexistant soul
2019-10-05 13:26:37 -07:00
YoYoBatty
a19c1bec3b Tesla code improvements and qdel checks (#46741)
Potentially stops machines from getting tesla zap multiple times which 
could result in explosions occuring dozens of times even when they've 
been deleted.
2019-10-05 13:18:53 -07:00
Fikou
05f0c2c1f3 adds the GRILL (#46844)
* a

* GRILL GANG

* sipp

* sip

* seep

* grug

* FSAIUGANOHNHOE

* bru

* a

* finish him

* compilies ^w^

* WOOO

* holy crap

* woo

* a

* h

* woo

* woo

* woo

* awoo

* aa

* aw shet

* heck you floyd

* at ath

* awo

* we like compiling code

* awo

* coal mat

* awoo

* aasdga

* a

* nice

* awoo

* awwoooooooooooooooooooooooo

* awoo

* spaceport bars

* grill gang

* aw

* awooo

* yee

* aw

* flod

* awoo

* awoo

* yesyesyyes

* a

* awoo

* holy sht

* h

* awoo

* awo

* aaaaaaaaa

* awoooooooooo

* awoo

* aw man

* honk

* well boys we did it

* oh mama mia

* ok cobby flushed

* awoo

* removes fun

* yeep

* i just said something

* vruh obama

* ye

* awoo

* awooooooo
2019-10-05 13:40:40 -04:00
Rob Bailey
8a87fc5065 update fix (#46832) 2019-10-05 18:48:54 +02:00
AnturK
5a0f57019c Event Arena Controller (#46746)
Event arena controller for you know what event.

TODO:

Turn lower/upper corner into just a/b and pick min/x/y
Unique HUD icon
2019-10-05 16:29:43 +13:00
Qustinnus
81c3d92129 Adds pick-up, drop and throw sounds for items. (#46677)
* finishes up

* adds sound volumes

* woops

* forgot to ctrl + s

* cloth

* smh

* done
2019-10-04 18:53:09 -04:00
Qustinnus
61bf8d7cd3 Fixes the roulette wheel (#46853)
* fixes roulette

* woops

* gotem
2019-10-04 14:22:33 -04:00
Arkatos1
9928614ddc Three spawn(0) conversions (#46837)
* Spawn converts

* Review fixes

* Update code/modules/mob/living/simple_animal/bot/bot.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-10-03 15:35:27 -04:00
NikNakFlak
c10dfbcde3 Adds a much needed pAI gameboy face sprite (#46839) 2019-10-03 12:15:42 -04:00
Rob Bailey
12d2e89d50 Cable Layers (#46761)
* Cable Layers

rudimentary function

layer placement

icons

rebase fixes

sprites

refactor

dme fix

dme fix again

potentially functional version

power bridge sprites work correctly

slightly better sprite

examine message + minor organization

* revert runtime changes
2019-10-03 13:25:33 +02:00
nemvar
83ca607511 Removes dead acid armor code. (#46782) 2019-10-03 02:37:46 -07:00
81Denton
b1c7b0b23a Improved laser pointer logging (#46769) 2019-10-03 02:24:47 -07:00
subject217
ee94180e6f run_obj_armor copypaste removal part 2 (#46752)
* Removes outdated copypaste run_obj_armor behavior

Also removes some random behavior on camera and APCs that not only did not work but was added with zero justification in a refactor. No changes for players.

* screwdriver to wirecutters

forgot about this

* checks for broken
2019-10-03 02:23:35 -07:00
NoxVS
1be0b68ce8 Adds new chaplain armor to the armament beacon (#46734)
* Adds new chaplain armor

Uses admin only armor from (I believe) hand of god mode

* Fixes

Changes description and removes mouth covering
2019-10-03 02:21:56 -07:00
Firecage
3996aaa197 Lets Syndi Mediborgs and Syndi Engiborgs get some of the upgrades of normal Mediborgs and Engiborgs. (#46760) 2019-10-03 02:17:17 -07:00
81Denton
a01f24da5c Shield wall generator logging (#46770)
* Shield wall generator logging

* Logs when shield gens run out of power and deactivate
2019-10-03 02:15:02 -07:00
nemvar
daffaefb71 Switches out the three billion args of electrocute act for flags (#46564)
* Switches out the three billion args of electrocute act for flags

* Adds autodoc to electrocute flags, sets the boolean I removed and tries to fix the ed209 file

* tries to fix ed209 again

* Fixes 209 hopefully

* Finally fixes that darn file

* one final one to fix the diff

* Or i guess i'll just do it myself
2019-10-02 23:14:19 +02:00
skoglol
a7b02fb6c7 Removes air mix tanks (#46480)
* Removes air mix tanks.

* and the maps.
2019-10-02 12:01:23 +02:00