Commit Graph

10218 Commits

Author SHA1 Message Date
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
RandomMarine 2d54930e4d You can now light cigars on burning people (#31081)
* adds lighting cigs on burning mobs

* backslash the

* src
2017-09-28 21:45:17 -05:00
Tungsten ac8eee7d4d Applying PDA overhaul Upstream (#30613)
* Applying PDA overhaul Upstream

Yeet?

* Used lordpidey's change

Like this?

* The build failed so I'm changing it back

* Update PDA.dm

* Update PDA.dm

* Make the settings visible only on the main screen

mode 0 is the hub, and the hub is the main menu. I think it'd be a lot more convenient for players to always have these options on the main menu if they need them. Makes it really easy to swap colors and fonts at the beginning of the round. I can put it in a settings menu if everyone really thinks it's necessary, but then someone would have to help me actually make the damn icons show up.

* Update PDA.dm

* Update PDA.dm

* Wait, I'm an idiot. I was editing the wrong thing.

* Here's your switch statements boi

* Declare font_index at the "Toggle_Font" code

I declared it exactly where it's relevant, but I think this looks unclean. I also redefined it which I actually needed to do.

* Replaced it where it was

cuz the build broke

* Make the color changer a picker instead of a field

An attempt

* Made these defines

@optimumtact @Cyberboss Like this?
2017-09-29 15:43:22 +13:00
oranges 84e96c53be Merge pull request #30985 from tgstation/Cyberboss-patch-5
Fixes frozen PDAs in the game logs
2017-09-29 15:41:34 +13:00
Robustin e630e51682 Secure containers give more hints, no RNG, for hacking (#30864)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Removes bad RNG

* More instructions

* gud grammer

* Right parenthesis

* Update secure.dm

* Update secure.dm

* Update secure.dm

* less explicit
2017-09-29 15:40:13 +13:00
Jordan Brown 4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +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
Jordan Brown 98e0cd5054 Self replacement fix (#30834) 2017-09-28 13:07:23 -03:00
AutomaticFrenzy 743fa84bd2 Fixed duplicate definition (#31048) 2017-09-28 10:24:12 -05:00
RandomMarine f2c803965a Back and inhands for air tanks 2017-09-27 17:33:21 -07:00
Jordan Brown 73ea1238dc Merge pull request #31024 2017-09-27 16:38:41 -04: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
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
RandomMarine 98ed3d0927 Air tanks get their own sprite + reset fix 2017-09-25 19:25:06 -07:00
Jordan Brown eb0a747c70 Merge pull request #30863 from pubby/bluepipe
Bluespace pipes
2017-09-25 13:27:29 -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
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
MoreRobustThanYou 1b6f56e8e2 Implant Chairs now also support organs (#30982)
* Implant Chairs now also support organs

* Update implantchair.dm

* Update implantchair.dm
2017-09-24 12:54:22 -04:00
Iamgoofball ac67dfeaee You can now Indiana Jones one explosion. (#30961)
* You can now Indiana Jones the nuke.

* Update freezer.dm
2017-09-23 23:33:20 -05: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
Jordan Brown 88303aa53d Fixes frozen PDAs in the game logs 2017-09-23 11:31:58 -04:00
Jordie 6cfaf3e61d Merge pull request #30939 from MoreRobustThanYou/patch-8
Using a soulstone on somebody now transfers your languages to the shade
2017-09-23 20:32:15 +10:00
ShizCalev 9cd4677eb9 Href tokens 2017-09-23 01:00:52 -04:00
Jordan Brown 77349d03a9 Merge pull request #30925 2017-09-22 14:03:31 -04:00
AnturK 292638c209 Specifies one format of variable declaration for the codebase. (#30926)
* Removes occurences of var name

* Contributing note

* note fixup
2017-09-22 13:43:52 -04:00
kevinz000 798a68e4ee Update flashbang.dm (#30862) 2017-09-21 15:08:28 -05:00
Leo 7be5dabb3b Merge pull request #30904 from ShizCalev/shaver-i-hardly-knew-her
Fixes shaving headless mobs
2017-09-21 16:46:50 -03:00
MoreRobustThanYou 0021c8b463 Same for swords 2017-09-21 15:34:44 -04: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
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
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