Commit Graph

1549 Commits

Author SHA1 Message Date
CitadelStationBot
201cb984c8 [MIRROR] Fix ingredient box icon (again) (#2823)
* Fix ingredient boxes

* Fix ingredient box icon (again)
2017-09-17 22:36:21 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842)
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
2017-09-17 22:35:51 -05:00
CitadelStationBot
c8b153ee71 [MIRROR] Varedit cleanup mk4 (#2833)
* Varedit cleanup mk4 (#30794)

* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description

* Varedit cleanup mk4
2017-09-17 22:31:30 -05:00
CitadelStationBot
8846708727 [MIRROR] Fixes cyborg airlock interaction (#2827)
* 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

* Fixes cyborg airlock interaction
2017-09-17 22:25:59 -05:00
CitadelStationBot
b1ba49f37e [MIRROR] Blobbernauts are healed quicker by cores and nodes (#2821)
* 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

* Blobbernauts are healed quicker by cores and nodes
2017-09-17 22:23:08 -05:00
CitadelStationBot
d0c9f79a37 [MIRROR] Makes building with plasma glass a thing. (#2820)
* Makes building with plasma glass a thing. (#30800)

* Makes building with plasma glass a thing.

* Updated grille.dm

* Makes building with plasma glass a thing.
2017-09-17 22:22:50 -05:00
CitadelStationBot
29a2309f70 [MIRROR] Fixes the issue of potted plants not having their overlays when picked up/equipped. (#2822)
* Fixes the issue of potted plants not having their overlays when picked up/equipped.

* Fixes the issue of potted plants not having their overlays when picked up/equipped.
2017-09-17 22:20:58 -05:00
CitadelStationBot
597c02135a [MIRROR] Maybe fix shuttle issues (#2841)
* Merge pull request #30819 from MrStonedOne/patch-425

Maybe fix shuttle issues

* Maybe fix shuttle issues
2017-09-17 21:35:42 -05:00
CitadelStationBot
b09aa9d082 [MIRROR] Fixes stacking when crafting items (#2814)
* Merge pull request #30746 from YPOQ/stackfix

Fixes stacking when crafting items

* Fixes stacking when crafting items
2017-09-17 12:03:31 -05:00
CitadelStationBot
ada383e629 [MIRROR] Clarifies the egyptian staff desc (#2811)
* Clarifies the egyptian staff desc (#30765)

* Clarifies the egyptia staff desc

* I can't write

* Clarifies the egyptian staff desc
2017-09-17 12:03:12 -05:00
CitadelStationBot
69c1d74f65 [MIRROR] Corrects killroom turf gas mixture (#2805)
* Corrects killroom turf gas mixture

* Corrects killroom turf gas mixture
2017-09-17 12:00:59 -05:00
CitadelStationBot
acc2104068 [MIRROR] Adds href token to station name rejection (#2798)
* Adds href token to station name rejection (#30740)

* Adds href token to station name rejection

* Update charter.dm

* Adds href token to station name rejection
2017-09-17 12:00:39 -05:00
CitadelStationBot
768c90fc03 [MIRROR] Removes vine floors and their sprite (#2807)
* 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.

* Removes vine floors and their sprite
2017-09-17 12:00:19 -05:00
CitadelStationBot
cbfee7e313 [MIRROR] Tank gauge rounding fix (#2800)
* Merge pull request #30749 from ShizCalev/tank-display-fix

Tank gauge rounding fix

* Tank gauge rounding fix
2017-09-17 11:58:50 -05:00
CitadelStationBot
d96f3f40a5 [MIRROR] PDA game log entry contains ckey (#2808)
* PDA game log entry contains ckey

* PDA game log entry contains ckey
2017-09-17 11:58:11 -05:00
Poojawa
dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818)
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
2017-09-17 11:56:55 -05:00
Poojawa
7cf4d0797b Applies WRITE_FILE to Citadel saves + Belly clone fix (#2694)
* Applies WRITE_FILE to everything

* Maybe this works, actually

* HAHAH I FIXED IT FUCKOS
2017-09-17 02:26:27 -05:00
Poojawa
71719f6787 Update _computer.dm 2017-09-16 09:19:47 -05:00
CitadelStationBot
e4af04823a [MIRROR] Fix pressure plate spam (#2775)
* Fix pressure plate spam (#30736)

* Fix pressure plate spam

* Not everything has feet

* Pressure plates . = ..()

* Fix pressure plate spam
2017-09-16 04:35:45 -05:00
CitadelStationBot
1db4249fa1 [MIRROR] Adds Abandoned Airlocks (#2784)
* Adds Abandoned Airlocks (#30705)

* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Abandoned Airlocks

* Added to maps

* inclusive numbering

* Update airlock.dm

* Tweaks

* Capital ChangeTurf

* Update airlock.dm

* no more update_icons

* Abandoned paths (#4)

* Abandoned paths

* Cleaned up dirty var

* Adds Abandoned Airlocks
2017-09-16 04:32:19 -05:00
CitadelStationBot
a91f7efe5e [MIRROR] Fixes the doomsday device announcements (#2789)
* Fixes the doomsday device announcements

* Fixes the doomsday device announcements
2017-09-16 04:31:46 -05:00
CitadelStationBot
ccd55bb779 [MIRROR] Remove /obj/proc/gang_contraband_value (#2799)
* Remove /obj/proc/gang_contraband_value() (#30744)

unused

* Remove /obj/proc/gang_contraband_value
2017-09-16 04:31:22 -05:00
Poojawa
0eb8cf0235 Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
CitadelStationBot
4dffe75a30 [MIRROR] Syndicate Borgs now show up as Syndicate Borgs in Check Antags (#2781)
* Merge pull request #30713 from ExcessiveUseOfCobblestone/patch-3

Syndicate Borgs now show up as Syndicate Borgs in Check Antags

* Syndicate Borgs now show up as Syndicate Borgs in Check Antags
2017-09-15 03:33:50 -05:00
CitadelStationBot
79ae8d8829 [MIRROR] Ports chasm exceptions to typecaches (#2777)
* Ports chasm exceptions to typecaches (#30717)

* Ports chasm exceptions to typecaches

* Ports chasm exceptions to typecaches
2017-09-15 03:24:57 -05:00
CitadelStationBot
af0080b00b [MIRROR] Stops ranged stack splitting (#2785)
* Merge pull request #30695 from KorPhaeron/magicstacks

Stops ranged stack splitting

* Stops ranged stack splitting
2017-09-15 02:51:53 -05:00
CitadelStationBot
f07369aead [MIRROR] Fixes nuking the syndicate base (#2767)
* Merge pull request #30694 from KorPhaeron/syndie_nuke

Fixes nuking the syndicate base

* Fixes nuking the syndicate base
2017-09-14 13:24:43 -05:00
CitadelStationBot
7d34286803 [MIRROR] Fixes a bunch of computers (#2766)
* Fixes a bunch of computers (#30693)

* Fixes a bunch of computers
2017-09-14 13:23:01 -05:00
CitadelStationBot
3516f4ef0a [MIRROR] turf now checks for inheritance, this is the future! (#2770)
* Turfs call ..() in attackby (#30707)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* ok this works

* ok this works

* turf now checks for inheritance, this is the future!
2017-09-14 13:18:01 -05:00
CitadelStationBot
c6b9892dc0 [MIRROR] Fixes potted plants putting you above wall objects (#2754)
* Merge pull request #30676 from ShizCalev/plant-layer-fix

Fixes potted plants putting you above wall objects

* Fixes potted plants putting you above wall objects
2017-09-14 07:39:13 -05:00
CitadelStationBot
40f5d7d4bf [MIRROR] Fixes wash_obj misuse (#2753)
* Fixes wash_obj misuse (#30658)

* Fixes wash_obj misuse

* This too

* Ree

* REEEEE

* Fixes wash_obj misuse
2017-09-14 07:38:51 -05:00
CitadelStationBot
82861d208b [MIRROR] Fixes lighting hard deleting (#2760)
* Fixes lighting hard deleting (#30684)

* Fixes lighting hard deleting
2017-09-14 06:44:17 -05:00
CitadelStationBot
099b6628fa [MIRROR] Full jobs will no longer be shown as priority for latejoiners (#2729)
* Full jobs will no longer be shown as priority for latejoiners

* Update card.dm
2017-09-13 22:54:41 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733)
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
2017-09-13 22:54:12 -05:00
CitadelStationBot
b4c27d5533 [MIRROR] Chainsaws now have a suicide! (#2734)
* Chainsaws now have a suicide! (#30559)

* i have the power !!

thanks, cobby!

* help my code is growing out of control

i'm not even touching the keyboard anymore

* do you like.... my car

* nobody saw that, compile BEFORE you commit kids

* LITERALLY THE BEST COMMIT OF ALL TIME

THANKS AGAIN COBBY FOR FIXING IT UP

* FINISHING PR

ICING ON CAKE

* LET THERE BE SOUND!

* mokay then

* really should have gotten around to this

yep

* Chainsaws now have a suicide!
2017-09-13 22:53:55 -05:00
CitadelStationBot
9a4f84da5e [MIRROR] Refactors roundstart centcom threat report. (#2739)
* Refactors roundstart centcom threat report.

* Update blob.dm

* Update changeling.dm

* Update traitor_chan.dm

* Update sandbox.dm

* Update traitor.dm
2017-09-13 22:50:01 -05:00
CitadelStationBot
0bc0d643ab [MIRROR] Fixes rack parts progress bar (#2737)
* Fixes rack parts progress bar

* Update tables_racks.dm
2017-09-13 22:49:23 -05:00
CitadelStationBot
d64c23b7f9 [MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts (#2740)
* Fix syndicate toy C20r and L6 Saw not having riot darts  (#30645)

*   Add riot darts back into toy C20r and L6 Saw

Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.

* Comments are good

Especially when inheritance makes everything weird.

* Fix syndicate toy C20r and L6 Saw not having riot darts
2017-09-13 20:57:54 -05:00
CitadelStationBot
3b144c423c [MIRROR] Fix CentCom issues (#2619)
* Fix CentCom issues

* Actually ports fixes
2017-09-13 20:43:11 -05:00
CitadelStationBot
34edb1b5e4 [MIRROR] Fixes the Orion Trail machine (#2703)
* Fixes the Orion Trail machine

* Update arcade.dm
2017-09-13 18:08:18 -05:00
CitadelStationBot
9d52a495b2 [MIRROR] Fix monastery shuttle + Pods (#2599)
* Fix monastery shuttle + Pods

* actually ports podfix
2017-09-13 17:58:25 -05:00
CitadelStationBot
083fc1a7b4 [MIRROR] Standardized power displays (#2539)
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
CitadelStationBot
abe52f40a6 [MIRROR] Fix transit tube atmos (again) (#2736)
* Fix transit tube atmos (again) (#30597)

* Fix transit tube atmos

* transit tube Initialize()

* Fix transit tube atmos (again)
2017-09-13 16:55:00 -05:00
CitadelStationBot
4da91bc330 [MIRROR] Fixes Archaeology not working (#2744)
* Fixes Archaeology not working (#30547)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* Fixes Archaeology not working
2017-09-13 16:53:30 -05:00
LetterJay
470d15fa2b Update borer_event.dm 2017-09-13 07:13:45 -05:00
LetterJay
1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
Kyle Spier-Swenson
3da71799ab Garbage collection tweaks and refactors. (#30118)
* Garbage collection queuing rewriting

* Some Tweaks

* Fixes some queue tracking oddities

* More tweaks

* Remove the middle two queue steps. tis was a silly idea

* New logging.

We store logging datums for use in tracking the stats of shit qdeleted

Added logging for destroy time as well as hard delete time, per type. As well as a few others

* Fix compile for testing

* Does the cyberboss

* does the antur
2017-09-13 01:47:12 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00