Commit Graph

9911 Commits

Author SHA1 Message Date
Jordan Brown 44d50b36b2 Removes some spawns 2017-09-28 10:25:15 -05:00
Ashe Higgs 60d3ce5c71 Adds Nars-Ian and clock hawks (#30856)
* Nars-Ian

* DEVOUR THE LESSERS IA IA

* alternate reality

* Adds clock hawks

* Whew, that took a while

* why yes there is

* Conflicts uno

* Conflicts 2
2017-09-28 10:23:05 -05:00
AnturK 792917ee31 Fixes shade attackby 2017-09-28 10:30:41 +02:00
Incoming5643 6096f68243 Fixes poly lying about his age
Recently poly was transitioned to increment his stats in Write_Memory, but the old incrementer was still around, which lead poly to double his age.
2017-09-27 19:13:19 -04:00
Jordan Brown 38ffa0a139 Merge pull request #31016 2017-09-27 16:39:07 -04:00
Jordan Brown be0a683b83 Merge pull request #31038 2017-09-27 16:36:40 -04:00
Armhulen d8bb784037 whoops we'll get right on that (#31020) 2017-09-27 00:45:26 -05:00
Ashe Higgs 59e7559876 Clockwork cult rework: Post-merge micro-patch (#31044)
* Now that we're merged, we can do polish stuff

* each day before bed I honor ratvar
2017-09-26 19:58:45 -05:00
vuonojenmustaturska 7d30e345ca Fixes MMI to AI law transfer (#31017)
* Fixes MMI to AI law transfer

* Fixes issue with preloaded laws on AI core
2017-09-27 10:52:03 +13:00
ShizCalev 4fc0cd32fe DisplayTimeText for round time on login 2017-09-26 16:37:31 -04: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
ShizCalev 2fce446104 Fixes alium leap exploit 2017-09-26 13:54:11 -05:00
AnturK 1304e83a76 Refactors cinematics. (#30888)
* Cinematic  refactor p1

* Refactors cinematics & related fixes

* Fix and cleanup

* Fixes survivor gibbing.

* qdel_null
2017-09-26 22:20:05 +13:00
Firecage 63f3423777 Makes borg modules and human species easily spawnable by admins from the mob spawn menu. 2017-09-25 23:12:52 +02:00
Jordan Brown 6c30f042cd Merge pull request #30884 from Arianya/patch-1
Remove ash drake hide from lesser ash drakes butcher loot
2017-09-25 13:23:47 -04: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
pubby 18f329a3f1 Datum abductors refactor (#30893)
* Datum abductors

* Update UFO crash ruin
2017-09-25 12:00:08 +13:00
KorPhaeron 48b83e3017 Stops AIs from giving the borg a free secondary light (#30913)
* Stops AIs from giving the borg a free secondary light

* Using a camera var now

* Wrong if

* My brain is not working
2017-09-25 11:57:58 +13: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
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
Robustin 0407dcf845 Fixes revolutionary deconversion messages and logging (#30956)
* Update login.dm

* Update login.dm

* Identifies rev deconverter

* Identifies rev deconverter

* Fixed/Updated Rev Deconversion Msg+Logging

* Deconv'd revs now see the damn message

* Improved logging
2017-09-23 12:05:53 -04:00
Jordie f9c108d1c4 Merge pull request #30948 from MoreRobustThanYou/patch-13
Support Holoparasites can no longer heal while not manifested
2017-09-23 20:34:00 +10:00
Jordie b6cf0b1793 Merge pull request #30943 from MoreRobustThanYou/patch-11
pAIs now transfer their languages to bots
2017-09-23 20:33:24 +10:00
ShizCalev b67d7ecdf6 Makes action buttons call the correct procs (#30921)
* Makes action buttons call the correct procs

* Changed to mob/living proc

* CB
2017-09-22 18:42:04 -04:00
MoreRobustThanYou 3949c90799 Removes spawn()s in securitrons (#30945)
* Removes spawns in securitrons

* Update sound.dm

* Update secbot.dm
2017-09-22 18:38:59 -04:00
Jordan Brown cf2aaa79ff Merge pull request #30917 2017-09-22 14:07:25 -04:00
Jordan Brown 77349d03a9 Merge pull request #30925 2017-09-22 14:03:31 -04:00
Robustin a8bcd21230 Zombies cease healing for 6 seconds after taking damage (#30885)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Organic var for Organs

* Update liver.dm

* Zombie healing ceases in combat

* Update zombies.dm

* Update liver.dm

* Update organ_internal.dm

* TIMER_OVERRIDE

* 2 equal signs

* New condition structure

* UNIQUE and OVERRIDE

* Removes timer
2017-09-22 13:47:42 -04:00
MoreRobustThanYou 5ab10d80d1 Support Holoparasites can no longer heal while not manifested 2017-09-21 19:59:34 -04:00
MoreRobustThanYou 9ce1520da0 pAIs now transfer their languages to bots 2017-09-21 18:12:34 -04:00
oranges b90b875b93 Merge pull request #30890 from vuonojenmustaturska/adminghostfix
Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc.
2017-09-21 23:32:15 +12:00
oranges 3791f0b443 Merge pull request #30896 from ShizCalev/debug-text
Removes old debug text
2017-09-21 23:29:29 +12:00
ShizCalev 440715fbe1 Stops restraint removal progress bar spam 2017-09-21 03:07:20 -04:00
YPO 212b673ae0 Fixes persistence 2017-09-20 16:27:34 -06:00
ShizCalev 3193b87b35 Makes gorillas drop brains when gibbed / butchered (#30878)
* Makes gorillas drop brains when gibbed / butchered

* CBB changes
2017-09-20 09:04:51 -05:00
Ashe Higgs 3c32c65e7c Gives engineering cyborgs an item they can use in place of circuits for basic construction (#30464)
Adds the electroadaptive pseudocircuit - technobabbly name intended - to engineering cyborgs. They can use this in place of circuit boards during construction of alarms, APCs, and firelocks to create a circuit at the cost of varying amounts of power. There's a brief cooldown between uses to prevent borgs from becoming circuit farms on wheels.

Note that in order to create circuits, you need to cannibalize simple circuits (anything the pseudocircuit can make) to get the material. Each pseudocircuit starts with five circuits by default.

It can also be used on a completed APC frame with no power cell to create an empty, low-capacity power cell in the APC at the cost of 500W of power; this is to allow borgs to repair a broken APC without external aid because the CE won't bring the fucking cell over get over here you brainless fuck.

Code-wise, this just adds extra checks to the frames' attackby procs that do the same thing as the other circuits. Airlock electronics, computer boards, and machine circuits cannot be made using this, and it's only for basic construction purposes.
2017-09-20 21:17:32 +12:00
oranges fdaa937f76 Merge pull request #30768 from Cyberboss/BringingSexyBack
Adds back required arrivals undockedness with a config
2017-09-20 20:54:06 +12:00
ShizCalev 39380d5b03 Removes old debug text 2017-09-19 18:56:39 -04:00
vuonojenmustaturska 1b1e87a19f cleanup 2017-09-20 00:23:30 +03:00
vuonojenmustaturska 2979017db9 Admin ghost fixes 2017-09-19 23:05:56 +03:00
XDTM e9897510cd Fixes species being referenced instead of copied when cloning (#30836)
* Fix species

* type

* keep some stuff

* fix
2017-09-19 12:01:39 -04:00
Arianya e96fda619b Remove ash drake hide from lesser ash drakes 2017-09-19 14:21:22 +01: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 ae5eb795a4 Update living.dm 2017-09-19 07:01:06 -04:00
MoreRobustThanYou bcb086bba9 Update living.dm 2017-09-19 06:41:01 -04:00
MoreRobustThanYou 43797249fc Update living.dm 2017-09-19 06:40:41 -04:00
MoreRobustThanYou 529bb908f7 FIXES NEW TEMP SYSTEM
WOOPS.
2017-09-19 05:16:15 -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
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 9bd4ead29f Merge pull request #30820 2017-09-17 21:08:42 -04:00