Commit Graph

1124 Commits

Author SHA1 Message Date
ShizCalev e865b3b8d6 Makes dust remains cleanable with acid. (#31875)
* Makes remains cleanable with acid

* I AM ALTERING THE DEAL.

* Acid act
2017-10-20 08:40:34 +02:00
Leo 96fa3315af Merge pull request #31838 from ShizCalev/foam-layer-fix
Fixes foam layer popping
2017-10-18 08:16:32 -02:00
ShizCalev da131693a4 Fixes foam layer popping 2017-10-17 04:23:20 -04:00
ShizCalev 721df8dacf Cleans up some istypes not using helpers 2017-10-16 15:30:30 -04:00
Jordan Brown ffc1da3876 Merge pull request #31713 from vuonojenmustaturska/initializefixesoct
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-15 12:30:52 -04:00
vuonojenmustaturska 104c208574 I WISH I WERE A BIRD 2017-10-14 20:06:39 +03:00
kevinz000 8d647ff524 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes (#30570)
* this will end horribly

* s

* kek

* wew

* i dont know what an atomized pr is

* lets hope this doesnt blow up

* ok

* Update living.dm

* Update flightsuit.dm

* Update living.dm

* Update living.dm
2017-10-13 18:09:20 -06:00
nicbn 0fa8587f83 Bullet decals tweak (#31420)
* wee

* screen clock update

* resist and stop pulling

* Whoop, Joan messed up on the selection border so here's some fixed icons for that

* there we go

* Update walls.dm

* Update walls.dm

* Update walls.dm
2017-10-13 10:46:45 -04:00
kevinz000 c073486645 Fixes explosion particles causing a massive amount of runtimes (#31608) 2017-10-13 10:14:42 -04:00
duncathan salt 454d16fe32 Minor refactor of how gas IDs are handled (#31528)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization
2017-10-11 15:04:12 -04:00
MoreRobustThanYou 102291de94 Removes some spawns from explosion effects (#31474)
* Update effects_explosion.dm

* god damn it

* Update effects_explosion.dm

* Update effects_explosion.dm

* THANK YOU KEVINZ FOR THE WRAPPER

* Update effects_explosion.dm

* Update effects_explosion.dm

* clean my ass
2017-10-10 16:40:28 -04:00
Tad Hardesty 13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
XDTM db0c10ea58 Refactors virus spreading (#31066)
* Refactors virus spreading

* Cyberfixes

* Bump to infect

* proper shoe protection

* Split ContractDisease

* Makes virus severity matter

* oops

* Virus severity changes

* defines

* infective_floor --> infective

* Fixes vomit and pulling infection
2017-10-09 14:08:21 +02:00
Jordan Brown 6b9832d661 Merge pull request #31388 from vuonojenmustaturska/atmoscherrypicking
Moves assert_gas() into a define it should always have been, speeding up atmos slightly
2017-10-07 14:36:28 -04:00
Jordan Brown b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
vuonojenmustaturska 890ba9dbe1 Imminent danger of skeletons
* Renamed GASLIST into ADD_GAS
* Reordered ASSERT_GAS arguments around
* Replaced all instances of add_gas with the define
* Removed once instance of manual duplication of ASSERT_GAS with the real deal
2017-10-07 04:34:24 +03:00
vuonojenmustaturska feabd41900 Always be alert for skeletons 2017-10-06 20:33:42 +03:00
ShizCalev 41430d70db Sets decal layer 2017-10-06 03:11:32 -05:00
Tad Hardesty 5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Jordan Brown d3dcc118ec Merge pull request #31340 from Firecage/codeshitnotshit
Does some code standardization/consistency.
2017-10-05 15:53:11 -04:00
XDTM 35d8a55926 Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() (#30525)
* Adds hostile environiment suits

* NOBODY SAW THIS

* the CURSE

* c

* No more stun removal

* fix

* a

* in the chest

* back

* Fixes

* duh

* fucking helmets fucking secbots fucking past coders

* yeah

* REEEEE

* revert to here

* this better work

* cyberboss

* Update effects.dm

* check for charges

* B U L K

* spraycans

* READY

* the if, man

* why the fuck did it convert to spaces

* Fix it
2017-10-05 11:52:47 -04:00
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage 2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
oranges 196f1ddc5e Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA
Makes mobs on fire light up
2017-10-04 12:12:49 +13:00
kevinz000 f8c8d43974 Fixes/tweaks wormholes event and portals (#30846)
* fix

* THERE WE GO

* Update portals.dm
2017-10-03 11:37:16 +02:00
KorPhaeron cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
ShizCalev 4b0d1a025a Makes mobs on fire light up 2017-10-01 15:15:26 -04:00
oranges 27f15b7892 Merge pull request #31078 from pubby/opspawn
Cleanup operative landmarks
2017-09-29 15:47:47 +13:00
kevinz000 bd8d9592f1 [READY]Refactors timestops to use fields (#30858)
* kek

* fixes

* Fixes

* fixes

* throw freeze

* woops

* double woops
2017-09-29 15:46:10 +13:00
XDTM 152c8901db Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow (#30572)
* Nurse spiders can set a hereditary directive for their children to follow

* Action buttons!

* unstale

* Done

* worth it

* unused now

* a

* Integration with #30593

* ports #30996

* span

* antur

* Adds spider midwife emoji

* paneled

* a

* fixed panels
2017-09-28 23:01:41 +02:00
pubby 87401b5918 Cleanup nukeops spawns 2017-09-27 19:53:16 -05:00
Ashe Higgs b7e7779c19 (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
* Starting on the rework

* Reworks the Ark

* Work on Reebe

* More Ark stuff

* this too

* Removes ark silliness, remaps Reebe a tad

* Spawning mechanics

* Work on gamemode code

* Finishes up ark stuff

* Removes Judgement, and lots of other changes

* New Ark activation sounds, Ratvar text

* Spawn protection!

* Adds the abscondence bijou

* Bijou stuff

* well, this is it

* somewhat absentminded coder

* Remaps the Reebe z

* replica fabricators now work!

* Guide paper!

* Now they're clockwork floors

* Infirmary, tweaks, numbers

* A new thing!

* this is ok for now

* I was gonna whine but it's actually necessary

* Adds damage scaling to ocular wardens

* I missed a thing

* you can go back too

* New clockwork armor sprites

* Weapons, scripture, oh my!

* no! shoo!

* hey, I forgot about you!

* this looks much better, I'll give you that

* no teleporting into the void!

* we have no need of you anymore

* Conflicteroos

* AUTOMATIC SPINNING CHAIRS

* how many times do we have to teach you this LESSON OLD MAN

* flagged!

* last time, meesa promise

* Conflicts 1

* wood filling

* Kindle is a projectile, and other stuff

* Chameleon jumpsuit, some small changes

* 150 hours of testing

* Curious is the trapmaker's art

* Conflicts 1

* naaah

* Fixes an ark sound

* Removes the prolonging prism

* Adds a delay to warping in

* First steps towards changing the power system

* Removes power from sigils, moves to global

* Conflicts 1

* zoom zoom

* Adds the stargazer, re-adds conversion

* conflicts? more like CLOCK-flicts

* get it? clockflicts?

* Daemon tuning

* Scraps components, 1/?

* A grace period, among other things

* You can't get to reebe from space no stop bad

* Adds some cogscarab shells to Reebe - yes, I get the sounds

* FUCK

* Chairs are very important.

* Clock golems, sound improvement, intercoms

* Sounds, floor fixes, conflicts

* Fixes the conflicts

* Prevents intercom use during non-clock rounds

* Wiki, HUD timer, tweaks, golems

* Components, removes unused structures, rep. fab power

* go-time

* Ending the round is not a good idea

* whoops, forgot about you

* ssh is ok

* this works too
2017-09-27 09:21:26 +13:00
Armhulen d46477fd16 Spiderpalooza 1: Foods! (#30992)
* things, okay? i forget

* spider lollipops were in

* Onule best spriter!

* spiderlings become food when destroyed

* spiderlings can be eaten now as a food item...

ew, man. wtf.

* #freeshit!
2017-09-26 11:31:59 -05:00
ShizCalev 74f5a8c904 DisplayTimeText mk2 (#30969)
* Adds new helper, DisplayTimeText

* Removed unused define

Thought it would've been nice to have for the future, but I guess it's
fine to go without it.

* CBB

* Revamp

* Early returns

* More cleanup

* Proc cleanup

* Makes fraction only show if seconds is < 1

* Last cleanup

* Revert

* Corrected incorrect round time.

Dunno how nobody ever caught that it was incorrect on live servers, gg.
2017-09-24 19:58:58 -04:00
vuonojenmustaturska f14c7191a5 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart (#30980)
* Small initialize fix batch

/mob/living/simple_animal/parrot/Poly/ghost
/obj/effect/spawner/bundle
/obj/item/device/radio/headset/headset_sec/alt/department
/obj/effect/mob_spawn/human/golem
/obj/item/device/radio/headset/abductor
/obj/item/nullrod/tribal_knife
/obj/effect/spawner/xeno_egg_delivery
/turf/open/chasm/straight_down

* Requested changes
2017-09-25 11:41:48 +13:00
oranges 28d725e8d5 Merge pull request #30975 from ShizCalev/href-tokens
Href tokens
2017-09-25 11:33:49 +13:00
Armhulen fa775e8def Rare Spider Variants! (#30593)
* vipers use venom, tarantulas are fat and slow.

* viper!

added!

* tarantula!

done!

* tarantulas are big guys

nobody pushin them round

* added maidwives, added spider channel

* me and cobby lose our minds over shitcode 2

electric boogaloo

* midwives have skins

shiny

* YES XHUIS GOT IT WORKING WHAT A GUY YEAAAAAAAAAAA

WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO

* new nurse sprite is in!

yay

* cosby joke about all my shit corrupting idk

this is gonna be annoying to fix

* Revert "cosby joke about all my shit corrupting idk"

This reverts commit 680b4c310e0b882f7465129c093e7f69fdff15c6.

* starts to add spidervenom, finishing tomorrow

* fuck god dammit shit fuck

* WE ARE BACK IN BIZNIZ TY ORANGES

* whoops

* feed me semour feed me all night long

fixes the cyberboss stuff except that complicated one i'll do something else with it for now

* temporary fix maybe

* lets just have this for now and i'll fix this later

* all good

* fixes

* does what i should have done a long time ago

* SKINS SKINS SKINS PULLAPALOOZA

* i think this does it okay

* spiders miright

* merge conflict fix?

* MISTAKES WERE MADE

* spider commands are cool now

* he protec

but he also attac

* ty joan

* ty joan again
2017-09-23 17:18:28 -04:00
ShizCalev 9cd4677eb9 Href tokens 2017-09-23 01:00:52 -04:00
vuonojenmustaturska 772924ba38 More Initialize() fixes, requires someone to test with DB (#30831)
* Batch 1

/obj/item/storage/firstaid/fire
/obj/structure/bookcase
/obj/item/book/random QDEL, not actually in the logs but returned wrong hint
/obj/effect/landmark/start/wizard QDEL
/obj/effect/landmark/start/wizard
/obj/effect/landmark/start/new_player
/obj/effect/landmark/latejoin
/obj/effect/landmark/xeno_spawn
/obj/effect/landmark/blobstart
/obj/effect/landmark/secequipment
/obj/effect/landmark/prisonwarp
/obj/effect/landmark/ert_spawn
/obj/effect/landmark/holding_facility
/obj/effect/landmark/thunderdome/observe
/obj/effect/landmark/thunderdome/one
/obj/effect/landmark/thunderdome/two
/obj/effect/landmark/thunderdome/admin

* Batch 2

/obj/machinery/computer/operating
/obj/machinery/computer/telecrystals/uplinker
/obj/item/card/id/centcom
/obj/item/card/id/syndicate
/obj/item/card/id/captains_spare
/obj/item/card/id/ert
/obj/item/card/id/ert/Security
/obj/item/card/id/ert/Engineer
/obj/item/card/id/ert/Medical
/obj/structure/trap
/obj/machinery/magnetic_controller
/obj/item/storage/toolbox
/obj/structure/table

* Batch 3

/obj/machinery/vending/snack/random
/obj/machinery/vending/cola/random
/obj/machinery/computer/pod
/obj/machinery/computer/message_monitor
/obj/machinery/computer/atmos_control
/obj/item/implanter
/obj/item/implantcase
/obj/item/construction
/turf/open/floor/grass
/turf/open/floor/grass/snow/basalt
/turf/open/floor/grass/fakebasalt
/turf/open/floor/carpet
/turf/open/floor/fakespace
/turf/open/floor/light
/turf/open/floor/mineral
/turf/open/floor/mineral/abductor
/turf/open/floor/circuit
/turf/open/floor/clockwork
/turf/open/floor/plating
/turf/open/floor/engine/cult

* Batch 4

/obj/item/storage/backpack/satchel/flat
/obj/item/storage/backpack/satchel/flat/secret
/turf/closed/indestructible/fakeglass
/turf/closed/mineral/random
/turf/closed/mineral/gibtonite
/turf/closed/mineral
/turf/open/floor
/obj/effect/spawner/lootdrop

* Batch 5

/obj/effect/spawner/lootdrop/maintenance
/obj/effect/spawner/lootdrop/costume
/obj/item/toy/eightball/broken
/obj/item/toy/eightball
/obj/item/toy/eightball/haunted
/obj/item/device/electropack
/obj/item/restraints/legcuffs/beartrap
/obj/machinery/airlock_sensor
/obj/item/storage/box/ingredients

* Batch 6

/mob/living/simple_animal/hostile/carp/ranged
/obj/structure/lattice/clockwork
/obj/structure/lattice/clockwork/large
/obj/structure/lattice/catwalk/clockwork
/mob/living/simple_animal/hostile/mushroom
/mob/living/carbon/alien
/mob/living/carbon/alien/larva
/mob/living/carbon/alien/humanoid
/mob/living/carbon/alien/humanoid/drone
/mob/living/carbon/alien/humanoid/royal/praetorian
/mob/living/carbon/alien/humanoid/sentinel
2017-09-19 08:45:18 -04:00
ShizCalev 301528bc6e Window spawner refactor (#30747) 2017-09-16 17:34:01 -04:00
vuonojenmustaturska 6e468720ab Fixes to more Initialize procs (#30641)
* batch 1

/mob/living/silicon/robot/syndicate
/obj/effect/decal/cleanable/blood/old
/obj/effect/decal/cleanable/blood/gibs
/obj/effect/decal/cleanable/blood/gibs/old
/obj/effect/decal/cleanable/ash
/obj/effect/decal/cleanable/ash/large
/obj/effect/decal/cleanable/greenglow
/obj/effect/decal/cleanable/vomit/old
/obj/effect/decal/cleanable/shreds
/obj/effect/decal/cleanable/oil
/obj/effect/decal/cleanable/crayon
/obj/effect/decal/cleanable
/obj/effect/temp_visual/point

* batch 2

/obj/effect/anomaly
/mob/living/carbon/monkey/punpun
/obj/item/queen_bee/bought
/mob/living/simple_animal/hostile/poison/bees
/mob/living/carbon/human
/area/ai_monitored
/area

* batch 3

/mob/living/simple_animal/hostile/blob/blobspore
/obj/item/spellbook
/mob/living/simple_animal/hostile/blob/blobbernaut
/mob/camera/blob
/obj/structure/noticeboard
/obj/structure/piano
/obj/item/clothing/head/helmet
/obj/item/gun/energy/laser/chameleon

* batch 4

/obj/machinery/airalarm
/obj/effect/decal/cleanable for reals
/obj/item/stack/rods
/obj/effect/decal/cleanable/crayon for reals
/obj/screen/parallax_layer
/obj/item/device/instrument
/obj/item/ore
/obj/item/coin

* batch 5, getting tgstation ready for halloween

/obj/machinery/meter/turf
/obj/machinery/capture_the_flag
/obj/effect/ctf/dead_barricade
/obj/structure/firepit
/obj/item/clothing/head/helmet/knight
/obj/structure/spacevine
/obj/effect/hallucination/simple/xeno
/obj/effect/hallucination/simple
/mob/living/simple_animal/shade/howling_ghost
/mob/living/simple_animal/hostile/retaliate/clown/insane
/obj/structure/bookcase
/mob/camera/aiEye/remote/base_construction
/obj/machinery/computer/camera_advanced/base_construction
/obj/item/device/wisp_lantern

* batch 6

/obj/item/device/warp_cube/red
/obj/item/device/shared_storage/red
/obj/item/melee/ghost_sword
/mob/living/simple_animal/hostile/mining_drone
/mob/living/brain
/obj/item/device/mmi/posibrain
/mob/living/carbon/human/interactive
/mob/living/carbon/human/interactive/angry
/mob/living/carbon/human/interactive/friendly
/mob/living/carbon/human/interactive/greytide
/mob/living/carbon/human/interactive/robust
/mob/living/carbon/monkey/angry
/mob/living/simple_animal/hostile/guardian/assassin
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech
/mob/living/simple_animal/hostile/syndicate/mecha_pilot
/mob/living/simple_animal/hostile/mimic/crate
/mob/living/simple_animal/hostile/mimic/copy

* batch 7

/mob/living/simple_animal/hostile/megafauna/colossus
/mob/living/simple_animal/hostile/megafauna/bubblegum
/mob/living/simple_animal/hostile/asteroid/goldgrub
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
/mob/living/simple_animal/hostile/asteroid/hivelordbrood
/mob/living/simple_animal/hostile/statue
/mob/living/simple_animal/hostile/wizard
/obj/machinery/power/smes
2017-09-13 02:47:17 -04:00
kingofkosmos a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
MoreRobustThanYou c48def94d8 Removes gangs (#30056) 2017-08-31 17:31:49 -03:00
kevinz000 169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00
MoreRobustThanYou 0a530cff9c Refactors forensics to a datum (#29542)
* ports plasmeme windows from /vg/

* Update window.dm

* It's the stairway to seinfield

* fixity fix fix

* See this code if you're wondering why I rarely get any sleep

* *scream

* now

* this is going to give me PTCSD - post-traumatic coding stress disorder

* *scream

* Improves forensics datum

* Meep.

* RA RA RASPTUIN... i'm not crazy, right?

* better

* I think it works... /s

* less compile errors

* Reduces compile errors to a much more managable 50

* shitcode.exe

* ehhh

* HEY EVERYONE, IT WORKS!!

* Make slide code less autistic

* blue skyyy

* no more bay forensics!

* IT  WORKS

* Remove EnforceSize, it isn't used.

* icon2html

* More bicon sutff

* eee

* aeee

* abc

* abc

* a

* abc

* e

* forensics check in initalize

* huh

* bleh

* Update _drone.dm

* Update _drone.dm

* Update _drone.dm
2017-08-24 09:08:22 +12:00
Ergovisavi 9fb70f22d8 ATMOS Resin removes iciness from floors (#29967)
* atmos resin now makes the floor non-slippery, increased the turf coverage of resin by one unit

* Atmos resin removes wetness on floor tiles upon generation
2017-08-22 14:30:23 +12:00
Joan Lung 5c84310552 faster swap 2017-08-20 12:11:52 -04:00
Ashe Higgs dfd642f861 Ports smart metal foam from FTL (#29963)
* Ports smart foam from FTL

* Adds foam grenades to the EngiVend

* Why are you doing htis?

* Stuff

* badoop
2017-08-18 23:05:37 -04:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00