ShizCalev
9cd4677eb9
Href tokens
2017-09-23 01:00:52 -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
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
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
pubby
956eb186a4
Traitorbro fixes ( #30876 )
...
* Add antag hud and fix traitorbro logging
* Traitorbro generate_report
* On second thought I don't like the comma
2017-09-20 20:47:31 +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
AnturK
755d264190
Fixes mode conversion runtime ( #30857 )
2017-09-19 07:40:40 -05: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
Jordie
fff02891ad
log file for pda messaegs ( #30827 )
2017-09-18 12:53:49 +02: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
Jordan Brown
ff8c09fe1b
Merge pull request #30819 from MrStonedOne/patch-425
...
Maybe fix shuttle issues
2017-09-17 19:17:18 -04:00
pubby
1e4d1ca42f
Traitorbro gamemode ( #30344 )
...
A dead-simple traitor variant.
It's like traitor, except instead of an uplink you get a buddy: your blood brother. You must team up with your brother to complete your objectives. It runs along side regular traitor mode, thus the name "traitorbro".
2017-09-18 11:02:23 +12: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
MoreRobustThanYou
76706ed0a8
Blobbernauts are healed quicker by cores and nodes ( #30527 )
...
* Blobbernauts are healed quicker by cores and nodes
i hate sitting for 3-5 minutes waiting to heal as a naut
* no you can't heal without a factory
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
2017-09-17 15:50:50 -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
Supermichael777
f38801983a
Fixes cyborg airlock interaction ( #30809 )
...
* changes the sheet check to respect cyborgs
* Uses the proc instead of a hack that we wound need to fix again
* I can code totaly, yeah, sober...
* I cant posibly be drunk yet i only GOT the wine a minute ago
2017-09-17 15:26:45 -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
ShizCalev
e679b62516
Varedit cleanup mk4 ( #30794 )
...
* Cleans up and corrects a bunch of varedits
* Plant varedits
* More layers
* Adjusted plant name/description
2017-09-17 00:11:18 -05:00
Kyle Spier-Swenson
ae3c027444
Maybe fix shuttle issues
...
Somebody download this branch and test it out, i'm at work
2017-09-16 16:46:02 -07:00
ShizCalev
301528bc6e
Window spawner refactor ( #30747 )
2017-09-16 17:34:01 -04:00
Jordan Brown
4a938abaa6
Merge pull request #30746 from YPOQ/stackfix
...
Fixes stacking when crafting items
2017-09-16 17:32:35 -04:00
YPOQ
51bdfae73b
Stops AIs from taking actions while depowered ( #30723 )
...
* Stops AIs from taking actions while depowered
* add spans
2017-09-16 17:06:32 -04:00
KorPhaeron
c9b9cac5b5
Clarifies the egyptian staff desc ( #30765 )
...
* Clarifies the egyptia staff desc
* I can't write
2017-09-16 17:01:31 -04:00
KorPhaeron
85e6e41cb1
Puts the computer circuit board back in nullspace where it supposedly belongs ( #30762 )
...
* Why do machines store their parts in nullspace?
* forcemove doesnt work
2017-09-16 16:23:34 -04:00
oranges
d71d8defa3
PDA game log entry contains ckey
2017-09-16 15:04:44 -05:00
vuonojenmustaturska
c35db0ec80
Removes vine floors and their sprite ( #30778 )
...
* removes vine floors and their sprite
* Once more, with feeling
* Revert "Merge branch 'kudzufix' of https://github.com/vuonojenmustaturska/tgstation into kudzufix"
This reverts commit 89d99caa75dcadabebdf44a6e4b6c40b2914156a, reversing
changes made to 92e89ed02b767b927a83ee3a878b6eb38f590c5c.
2017-09-16 16:01:13 -04:00
Firecage
920946408c
Fixes the issue of potted plants not having their overlays when picked up/equipped.
2017-09-16 21:58:07 +02:00
shizcalev
e7cf1e3115
Corrects killroom turf gas mixture
2017-09-16 14:57:54 -05:00
Robustin
f782a24f53
Dice will now roll when thrown ( #30745 )
...
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Dice now roll when thrown
* Better var
2017-09-16 11:37:16 -05:00
Leo
4995719fbd
Merge pull request #30749 from ShizCalev/tank-display-fix
...
Tank gauge rounding fix
2017-09-16 09:22:34 -03:00
pubby
2b1601d8e7
Fix ingredient boxes
2017-09-16 06:08:38 -05:00
MoreRobustThanYou
808c780353
Remove /obj/proc/gang_contraband_value() ( #30744 )
...
unused
2017-09-15 19:18:15 -05:00
Jordan Brown
adc4d49164
Merge pull request #30735 from ShizCalev/numbers
...
Cleaned up some decimal values.
2017-09-15 16:47:55 -04:00
MoreRobustThanYou
318bf15c3b
Adds href token to station name rejection ( #30740 )
...
* Adds href token to station name rejection
* Update charter.dm
2017-09-15 16:47:26 -04:00
Leo
aecf3df159
Deletes empty file ( #30729 )
...
* Deletes empty file
* Also removes from the DME
2017-09-15 07:06:40 -05:00
YPO
513eba48bd
Fixes the doomsday device announcements
2017-09-15 05:14:22 -05:00
KorPhaeron
ed43a09864
Prevents the creation of Shadowzombiechangelings ( #30681 )
...
* Prevents the creation of Shadowzombiechangelings
* You can still zombie yourself if you really want
* (
2017-09-15 10:07:03 +02:00
Jordan Brown
3f4f44cbd1
Merge pull request #30695 from KorPhaeron/magicstacks
...
Stops ranged stack splitting
2017-09-15 01:19:53 -04:00
