Commit Graph

22537 Commits

Author SHA1 Message Date
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
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
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
MoreRobustThanYou 1cae7e2aae Zombies now stay dead if they suicide (#30941)
* Zombies now stay dead if they suicide

* Update items.dm

* Update items.dm
2017-09-23 20:32:44 +10:00
Jordie df881bca23 Merge pull request #30931 from Cyberboss/MoreHref
Fixes create outfit Href issues
2017-09-23 20:31:35 +10:00
ShizCalev 9cd4677eb9 Href tokens 2017-09-23 01:00:52 -04:00
MoreRobustThanYou 21fb348e92 Taking the beaker out of a cryotube now tries to put it into your hand (#30938)
* Taking the beaker out of a cryotube now tries to put it into your hand

* this is better

* THIS is better

* Fixes potential bugs

* Update cryo.dm
2017-09-22 19:44:28 -04: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
Jordan Brown c6cea01c36 Merge pull request #30933 2017-09-22 14:02:01 -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
ExcessiveUseOfCobblestone 41f551776d Fixes sentience potions working through cams (#30914) 2017-09-22 13:45:56 -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
JJRcop 69669be0ad Possibly fixes runtimes with gun suicide
oops
2017-09-22 02:54:34 -04:00
JJRcop 5669008080 Suiciding with a gun blows your brain out 2017-09-22 01:42:21 -04:00
oranges d7b48a9d31 Merge pull request #30851 from Firecage/nopatchesonnonorganiclimbspleaseandthankyoumistergoof
Fixes it so patches do not work on robotic limbs.
2017-09-22 17:32:12 +12: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
Leo c871e52ddb Merge pull request #30912 from tgstation/Cyberboss-patch-4
Fixes IRC ahelp answer notifications
2017-09-21 16:45:10 -03:00
AnturK d349ceefae Fixes game panel href token 2017-09-21 17:25:23 +02:00
Jordan Brown 2af06b3554 Fixes create outfit Href issues 2017-09-21 10:33:30 -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
oranges 0b25ab6055 Merge pull request #30891 from vuonojenmustaturska/adminhref
Fixes banning panel href errors, adds href helper functions
2017-09-21 23:27:40 +12:00
ShizCalev 440715fbe1 Stops restraint removal progress bar spam 2017-09-21 03:07:20 -04:00
YPO 3930d1886f initialize 2017-09-20 16:59:59 -06:00
YPO 212b673ae0 Fixes persistence 2017-09-20 16:27:34 -06:00