Commit Graph

3752 Commits

Author SHA1 Message Date
CitadelStationBot
5ed14bfedd [MIRROR] Adds more missing href tokens (#2749)
* Adds more missing href tokens (#30664)

* Adds more missing href tokens
2017-09-14 07:37:25 -05:00
CitadelStationBot
7dc9ac7e2d [MIRROR] Fixed small error causing signalers to fail to attach to each other in an assembly (#2750)
* Fixed small error in signalers causing signalers to fail to attach to eachother in an assembly (#30675)

* Fixed small error causing signalers to fail to attach to each other in an assembly
2017-09-14 07:36:13 -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
1051fb4fa7 [MIRROR] Corrects runtime in observer.dm (#2610)
* Corrects runtime in observer.dm

* Update observer.dm

* Update observer.dm

* Update observer.dm

* Update observer.dm
2017-09-13 22:55:22 -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
40e0bae912 [MIRROR] Nope (#2715)
* Nope

* Update secrets.dm
2017-09-13 22:50:15 -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
9031a1b671 [MIRROR] Soft crit slowdown for all carbons (#2743)
* Soft crit slowdown for all carbons

* Update carbon_movement.dm

* Update carbon_movement.dm

* Update species.dm

* actually pay attention to spacings
2017-09-13 21:29:50 -05:00
LetterJay
a688d77063 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-13 20:58:57 -05:00
LetterJay
6c754246e5 carrot plushie 2017-09-13 20:58:35 -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
067e03726f [MIRROR] Renames the mob spawner menu (#2620)
* Renames the mob spawner menu

* Actually mirrors
2017-09-13 20:42:40 -05:00
CitadelStationBot
82d0aae420 [MIRROR] Changes shuttle port direction var from an angle to a dir (#2613)
* Changes shuttle port direction var from an angle to a dir

* actually ports the directions

* Update shuttle.dm

* how
2017-09-13 20:39:55 -05:00
CitadelStationBot
26320a7047 [MIRROR] Fixes stands not dying with their user (#2615)
* Fixes stands not dying with their user

* actually mirrors
2017-09-13 20:26:52 -05:00
Poojawa
8406baebbe Makes APC cell_type actually pick a cell (#2747)
* Ports TG#30327

* Update apc.dm

* maybe delta can be fully copies over, yes?
2017-09-13 19:57:21 -05:00
CitadelStationBot
e1d2d3d36d [MIRROR] Adds "large bun" hairstyle (#2609)
* Adds "large bun" hairstyle

* bun hair hair'd
2017-09-13 18:34:40 -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
b8667591f4 [MIRROR] Minor touchups to chemistry/bar/virology machinery #2484 2017-09-13 17:59:07 -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
f6dfc177f5 [MIRROR] It's oranges (#2486)
* It's oranges

* thanks oranges
2017-09-13 17:56:54 -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
1c06a2b277 [MIRROR] Fixes goliath tentacles (#2738)
* Merge pull request #30646 from ChangelingRain/tentafix

Fixes goliath tentacles

* Fixes goliath tentacles
2017-09-13 16:53:52 -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
63c94a5c2b Merge branch 'master' into upstream-merge-30633 2017-09-13 08:00:06 -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
LetterJay
be15a30098 Update mapping.dm 2017-09-13 03:56:06 -05:00
LetterJay
6b5fbc9bcd Update one_click_antag.dm 2017-09-13 03:49:32 -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
aa09cd4785 Update teleport.dm 2017-09-13 00:50:41 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
LetterJay
4ee17d5167 Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583
[MIRROR] Fixes initialize hints for a fair number of mobs and items
2017-09-12 23:31:28 -05:00
LetterJay
c924ec765a Update ed209bot.dm 2017-09-12 23:19:05 -05:00
LetterJay
e88bb9c612 Update shadowpeople.dm 2017-09-12 23:15:53 -05:00
LetterJay
6c5774724d Update sound.dm 2017-09-12 23:15:48 -05:00
LetterJay
f55ad5ec95 Update safe.dm 2017-09-12 23:12:19 -05:00
Poojawa
3a7cc3df75 re-nerfs cakehat 2017-09-12 23:01:48 -05:00
LetterJay
1d040d46d1 Merge pull request #2701 from Citadel-Station-13/upstream-merge-30564
[MIRROR] Spetsnaz Pyro Bundle Rebalance
2017-09-12 19:17:23 -05:00
LetterJay
912746d8a4 Merge pull request #2700 from Citadel-Station-13/upstream-merge-30584
[MIRROR] Fixes ventriloquist dummy
2017-09-12 19:11:09 -05:00
LetterJay
0429a75e52 Merge pull request #2710 from Citadel-Station-13/upstream-merge-30592
[MIRROR] Fixed changeling augmented eyesight ability
2017-09-12 19:10:52 -05:00
LetterJay
81fdf521fb Merge pull request #2712 from Citadel-Station-13/upstream-merge-30502
[MIRROR] Makes shiny versions of lavaland monsters slightly more distinct
2017-09-12 19:10:21 -05:00
LetterJay
e24de430f5 Merge pull request #2730 from Citadel-Station-13/upstream-merge-30608
[MIRROR] adds logging to graivpult precision throwing
2017-09-12 19:09:44 -05:00