Commit Graph

22499 Commits

Author SHA1 Message Date
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
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
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
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
Jordan Brown 120e339625 Fixes IRC ahelp answer notifications 2017-09-20 15:50:00 -04:00
Robustin 21daf6e4d8 Fix: No more beating sounds from dead hearts (#30871)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Removes beating from nonbeating hearts

* single check
2017-09-20 10:58:16 -05:00
ShizCalev c06c63662b Makes magillitis affect all Hominidae. (#30841) 2017-09-20 09:05:03 -05: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
Jordan Brown 864276ae14 More changelog functions (#30711)
* Comprehensive changelogs

* FrozenGuy5's images

* Revert CONTRIBUTING.md

* Fix PULL_REQUEST_TEMPLATE.md wording

* Default the setting to off in the webhook procesor

* And in secret.php
2017-09-20 20:57:44 +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
oranges 58d3213c05 Merge pull request #30842 from tgstation/Cyberboss-patch-1
Fixes sleepy pen uplink description
2017-09-20 20:51:14 +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 e3619415fc fix 2017-09-20 00:09:48 +03: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
vuonojenmustaturska 2979017db9 Admin ghost fixes 2017-09-19 23:05:56 +03:00
Jordan Brown 9f722b7778 Merge pull request #30833 2017-09-19 12:07:48 -04:00
Jordan Brown b7766576b3 Merge pull request #30835 2017-09-19 12:07:25 -04:00
Jordan Brown 8a9ddb1b34 Merge pull request #30861 2017-09-19 12:04:52 -04: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
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
Jordan Brown 66a8bfb304 Merge pull request #30881 from MoreRobustThanYou/patch-4
FIXES NEW TEMP SYSTEM
2017-09-19 08:44:15 -04:00
oranges f304112418 Merge pull request #30860 from ninjanomnom/quickfix
Removes dead testing code
2017-09-19 23:03:40 +12: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
pubby 01dac64000 Remove unused check_pressure proc (#30853) 2017-09-19 00:26:24 -05:00
Robustin 2a8047ea9c Zombie claws do +1 damage (#30826)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Zombie claws do one more damage

* Update items.dm
2017-09-19 00:07:13 -05:00
pubby 649e286caf Fix pipenets 2017-09-18 06:11:57 -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
ninjanomnom a1c6e00496 removes dead testing code 2017-09-18 06:14:49 -04:00
Firecage a937eccb8b Fixes it so patches do not work on robotic limbs. 2017-09-18 05:22:47 +02:00
Cyberboss 9bd4ead29f Merge pull request #30820 2017-09-17 21:08:42 -04:00
Cyberboss 0d02779410 Merge pull request #30821 2017-09-17 21:08:31 -04:00
Cyberboss 8109e26c09 Merge pull request #30823 2017-09-17 21:08:21 -04:00
Cyberboss 08a3c4bd0d Merge pull request #30824 2017-09-17 21:08:12 -04:00