Commit Graph

10683 Commits

Author SHA1 Message Date
ShizCalev 4571049517 Fixes shaving headless mobs 2017-09-19 23:08:41 -04:00
ShizCalev 39380d5b03 Removes old debug text 2017-09-19 18:56:39 -04:00
TehZombehz b4f2533359 Adds some new plushies (#30751)
* Adds some cartoony plushies

Adds some more cartoony plushies and adds them to the toy crate.

* Conflicts 1

* Conflicts 2

* Conflicts 3
2017-09-20 08:53:21 +12:00
kevinz000 5d0afedcf5 Fixes safes not having adjacency checks (#30859)
* Update safe.dm

* Update safe.dm
2017-09-19 11:56:16 -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
MoreRobustThanYou 96718e9648 Cleans up internal temp code (#30715)
* cleanup

* Update living.dm

* Update atoms.dm

* Update objs.dm
2017-09-19 21:01:42 +12:00
pubby 7c1cdef7de Bluespace pipe fixes (Cyberboss, Leoz) 2017-09-18 14:01:45 -05:00
pubby b653e2b387 Adds bluespace pipes 2017-09-18 06:57:56 -05:00
Emmett Gaines 76c08c601a New squeaky datum and plushes (#30710)
* New squeaky datum and plushies

new plush subtype
clown shoes, bike horns, and mice slightly changed to use the datum

* narsie and ratvar plushes

* fixes duplicate obj/item/attack_self()

and other misc requested changes

* moves the sounds into initialize
2017-09-18 12:49:03 +02:00
Cyberboss 08a3c4bd0d Merge pull request #30824 2017-09-17 21:08:12 -04:00
ShizCalev 62229e5c70 Makes building with plasma glass a thing. (#30800)
* Makes building with plasma glass a thing.

* Updated grille.dm
2017-09-17 16:06:13 -04:00
Cyberboss f4862d8160 Merge pull request #30803 2017-09-17 15:35:16 -04:00
Cyberboss fec7528449 Merge pull request #30816 2017-09-17 15:35:07 -04:00
shizcalev 81e5154a70 Various grammar fixes 2017-09-17 01:46:41 -04:00
ShizCalev 64c451c402 Fixes esaw icon (#30797) 2017-09-17 00:12:27 -05:00
ShizCalev e679b62516 Varedit cleanup mk4 (#30794)
* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description
2017-09-17 00:11:18 -05:00
ShizCalev 301528bc6e Window spawner refactor (#30747) 2017-09-16 17:34:01 -04:00
Jordan Brown 4a938abaa6 Merge pull request #30746 from YPOQ/stackfix
Fixes stacking when crafting items
2017-09-16 17:32:35 -04:00
YPOQ 51bdfae73b Stops AIs from taking actions while depowered (#30723)
* Stops AIs from taking actions while depowered

* add spans
2017-09-16 17:06:32 -04:00
KorPhaeron c9b9cac5b5 Clarifies the egyptian staff desc (#30765)
* Clarifies the egyptia staff desc

* I can't write
2017-09-16 17:01:31 -04:00
oranges d71d8defa3 PDA game log entry contains ckey 2017-09-16 15:04:44 -05:00
Firecage 920946408c Fixes the issue of potted plants not having their overlays when picked up/equipped. 2017-09-16 21:58:07 +02:00
Robustin f782a24f53 Dice will now roll when thrown (#30745)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Dice now roll when thrown

* Better var
2017-09-16 11:37:16 -05:00
Leo 4995719fbd Merge pull request #30749 from ShizCalev/tank-display-fix
Tank gauge rounding fix
2017-09-16 09:22:34 -03:00
pubby 2b1601d8e7 Fix ingredient boxes 2017-09-16 06:08:38 -05:00
MoreRobustThanYou 808c780353 Remove /obj/proc/gang_contraband_value() (#30744)
unused
2017-09-15 19:18:15 -05:00
MoreRobustThanYou 318bf15c3b Adds href token to station name rejection (#30740)
* Adds href token to station name rejection

* Update charter.dm
2017-09-15 16:47:26 -04:00
Jordan Brown 3f4f44cbd1 Merge pull request #30695 from KorPhaeron/magicstacks
Stops ranged stack splitting
2017-09-15 01:19:53 -04:00
YPO 35378dc7f3 cleanup 2017-09-14 22:49:54 -06:00
shizcalev eb935d829e Tank gauge fix 2017-09-14 22:16:07 -04:00
YPO 5c9fe55858 Fixes stacking when crafting items 2017-09-14 16:31:46 -06:00
pubby 4c53ce2071 Fix pressure plate spam (#30736)
* Fix pressure plate spam

* Not everything has feet

* Pressure plates . = ..()
2017-09-15 10:04:10 +12:00
ShizCalev d71efa0859 Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)
* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references
2017-09-14 12:14:52 -04:00
Jordan Brown 5d761b845b Fixes wash_obj misuse (#30658)
* Fixes wash_obj misuse

* This too

* Ree

* REEEEE
2017-09-13 18:31:22 -05:00
KorPhaeron 39479a8149 Merge pull request #30676 from ShizCalev/plant-layer-fix
Fixes potted plants putting you above wall objects
2017-09-13 18:30:02 -05:00
KorPhaeron 6d9414a2e5 Remove src. where I can 2017-09-13 13:33:09 -05:00
Jordan Brown 61d6184eac Merge pull request #30652 2017-09-13 14:08:14 -04:00
KorPhaeron 592ad429d8 Stops ranged stack splitting 2017-09-13 11:34:03 -05:00
YPO 987db7dc84 Fixes rack parts progress bar 2017-09-13 03:09:52 -05:00
pubby ec06e3fe6e Fix transit tube atmos (again) (#30597)
* Fix transit tube atmos

* transit tube Initialize()
2017-09-13 02:57:47 -04:00
Armhulen 7ea6b6f709 Chainsaws now have a suicide! (#30559)
* i have the power !!

thanks, cobby!

* help my code is growing out of control

i'm not even touching the keyboard anymore

* do you like.... my car

* nobody saw that, compile BEFORE you commit kids

* LITERALLY THE BEST COMMIT OF ALL TIME

THANKS AGAIN COBBY FOR FIXING IT UP

* FINISHING PR

ICING ON CAKE

* LET THERE BE SOUND!

* mokay then

* really should have gotten around to this

yep
2017-09-13 08:50:09 +02: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
shizcalev 936a790318 Fixes potted plants putting you above wall objects 2017-09-12 19:38:56 -04:00
kingofkosmos 4fdde31ce3 Fixes monkey's being able to open PDA's UI. 2017-09-12 11:07:21 +03:00
KorPhaeron 35279a3371 Nightmare (#30415)
Nightmares

-Burn in the light/heal in the dark

-Have nightvision

-Have shadow walk

-Have an armblade that can destroy objects that produce light, and has a chance to destroy light producing objects a targeted mob is holding. It will also deactivate borg headlamps for 10 seconds.

-Can't be hit by gunfire in the dark (this is my sad attempt at solving the stun issue, but they'll likely need something else)

I also did a minor refactor of borgs losing their ability to use headlamps to use world.time instead of a timer
2017-09-12 07:23:35 +10:00
Ashe Higgs 18bd289d51 Adds departmental banners (#30484)
* Admin-only departmental banners

* Highberboss + no-inspiration variants

* cargonia shall rise again

* p_their()

* Adds recipes for each banner

* Conflicts 1

* Conflicts

* examine that sucker
2017-09-11 14:37:09 -04:00
Jordan Brown 54e98cf6c9 Merge pull request #30505 from Xhuis/vet_remap
Slightly remaps and adds more supplies to the animal hospital ruin
2017-09-11 14:05:17 -04:00
Xhuis 345548d71c a little odd, but sure 2017-09-11 13:50:39 -04:00
KorPhaeron 10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
Jordan Brown 5909e7e01b Merge pull request #30506 2017-09-11 13:37:58 -04:00