Commit Graph

22563 Commits

Author SHA1 Message Date
oranges
36eaf2b6ce Merge pull request #31075 from Incoming5643/patch-35
Fixes Poly lying about his age
2017-09-29 15:47:26 +13:00
kingofkosmos
b3a291640f Fixes MMI buckled-warning (#31061)
* Fixes MMI having a buckled-warning when trying to move.

* Comment added.
2017-09-28 21:46:34 -05: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
YPOQ
58f1478324 Fixes larva evolving while restrained (#31060) 2017-09-28 21:46:02 -05: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
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
KorPhaeron
962081866e Advanced camera consoles use a list for z lock rather than a single z level (#30661)
* Refactor Abductor Console

* Station lock
2017-09-28 12:24:34 +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
1045621337 Merge pull request #31030 2017-09-27 16:38:18 -04:00
Jordan Brown
58d4e73c6a Merge pull request #31033 2017-09-27 16:37:34 -04:00
Jordan Brown
ba10888e3a Merge pull request #31035 2017-09-27 16:37:08 -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
ShizCalev
79eeed829e Makes the mining vendor give more verbose feedback 2017-09-26 23:29:46 -04: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
AutomaticFrenzy
861b3d7d9d Wizard being mute now blocks touch attacks from activating (can still be cast) 2017-09-26 15:52:35 -04:00
JJRcop
3454a1e5f0 Blackbox stat for internet midis 2017-09-26 15:12:23 -04:00
ShizCalev
2fce446104 Fixes alium leap exploit 2017-09-26 13:54:11 -05: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
AutomaticFrenzy
9e1f582cbb Wizard can't cast shout or whisper spells when he is unable to speak 2017-09-26 12:19:50 -04:00
jughu
a1490bca04 Adds two more IMPORANT color burger colors (#31010)
* Update snacks_burgers.dm

* Update recipes_burger.dm

* Update snacks_burgers.dm

* Update snacks_burgers.dm
2017-09-26 09:51:18 -04:00
Jordan Brown
5f75559540 Fixes missing Href tokens (#30987)
* Fixes missing Href tokens

* Add missing form field. Fixes #30986
2017-09-26 14:26:42 +02:00
Emmett Gaines
6573100acf fixes shuttles creating duplicate area types (#31008) 2017-09-26 14:25:52 +02:00
vuonojenmustaturska
72546c5828 Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at (#30967)
* Jump boots fix

* requested changes

* Requested changes, also whoops
2017-09-26 22:28:56 +13: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
ShizCalev
5d91844926 Fixes suppressing weapons in your bag / pocket (#30894)
* Fixes suppressing in pocked and w_class issues

* Used defines for some things

* Reworded

* Removed the now redundant initial_w_class var

* Early returns

* Null
2017-09-26 11:19:00 +02: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
eb0a747c70 Merge pull request #30863 from pubby/bluepipe
Bluespace pipes
2017-09-25 13:27:29 -04: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
oranges
20796d9207 Merge pull request #30984 from tgstation/Cyberboss-patch-4
Makes keywords_lookup use the global token
2017-09-25 11:34:46 +13:00
oranges
c338296096 Merge pull request #30983 from tgstation/Cyberboss-patch-2
Makes TicketHref use the global token
2017-09-25 11:34:22 +13:00
oranges
28d725e8d5 Merge pull request #30975 from ShizCalev/href-tokens
Href tokens
2017-09-25 11:33:49 +13:00
Jordan Brown
5fbc6c262b Makes a flags var use NONE instead of 0 2017-09-24 01:58:50 -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
Cyberboss
dd3612325b Merge pull request #30953 2017-09-23 12:11:19 -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
dc084bfc57 Makes keywords_lookup use the global token 2017-09-23 11:27:08 -04:00
Jordan Brown
1101f64d4a Makes TicketHref use the global token 2017-09-23 11:23:20 -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