shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,400 Commits 5 Branches 0 Tags
e0837a45b63b5f57154a76e2fb36984e67daead9
Commit Graph

2269 Commits

Author SHA1 Message Date
deathride58
c4e3b778b3 Merge branch 'master' into crewobjectivesandmiscreants 2017-09-17 02:26:07 +00:00
CitadelStationBot
a9d42c9051 [MIRROR] Fix clothing crafting menu for realsies this time (#2812) 
* Fix clothing crafting menu for realsies (#30776)

* Fix clothing crafting menu for realsies this time
 2017-09-16 20:25:42 -05:00
CitadelStationBot
d2db21dbdf [MIRROR] Ninja adrenaline boost removes stamina damage (#2783) 
* Merge pull request #30704 from YPOQ/boost

Ninja adrenaline boost removes stamina damage

* Ninja adrenaline boost removes stamina damage
 2017-09-16 04:46:41 -05:00
CitadelStationBot
956efbef27 [MIRROR] Removes corgis as a facehugger target (#2791) 
* Removes corgis as a facehugger target (#30719)

* Removes corgis as a facehugger target
 2017-09-16 04:33:16 -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
ca2665a128 [MIRROR] gives the krebs a new sprite (#2761) 
* gives the krebs a new sprite

* Update crab.dm
 2017-09-15 03:35:56 -05:00
CitadelStationBot
40a34e2a63 [MIRROR] Fixes evidence bags showing ghost contents after their contents get deleted (#2782) 
* Merge pull request #30702 from vuonojenmustaturska/evidencebags

Fixes evidence bags showing ghost contents after their contents get deleted

* Fixes evidence bags showing ghost contents after their contents get deleted
 2017-09-15 03:35:29 -05:00
CitadelStationBot
941f63e7f9 [MIRROR] Adds a tip to examine for L6 SAW machinegun (#2779) 
* Merge pull request #30724 from JJRcop/saw_that_but_didnt_see_that

Adds a tip to examine for L6 SAW machinegun

* Adds a tip to examine for L6 SAW machinegun
 2017-09-15 03:34:15 -05:00
CitadelStationBot
574c967f87 [MIRROR] Fix crafting menu runtime (#2778) 
* Merge pull request #30712 from pubby/craftingfix

Fix crafting menu runtime

* Fix crafting menu runtime
 2017-09-15 03:24:13 -05:00
CitadelStationBot
c4e6642530 [MIRROR] Stops dead monkeys from moving (#2780) 
* Merge pull request #30709 from vuonojenmustaturska/hisgrace

Stops dead monkeys from moving

* Stops dead monkeys from moving
 2017-09-15 03:23:40 -05:00
CitadelStationBot
b5dc828756 [MIRROR] Procedurally generated Gondolas. (#2786) 
* Procedurally generated Gondolas. (#30700)

* Adds Gondoland and the rare Gondolas

* at the end of history

* /lizard >>> /gondola

* expand GOND

* for cyberboss he wants it in TGM

* thicc health

* thiccer health

* Procedurally generated Gondolas

* Procedurally generated Gondolas

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Procedurally generated Gondolas.
 2017-09-15 03:22:19 -05:00
Poojawa
8a2ec7d39a Update radiation_storm.dm 2017-09-14 13:32:48 -05:00
CitadelStationBot
35fc9d0391 [MIRROR] Fixes pAI integrated light (#2764) 
* Fixes pAI integrated light (#30690)

* Fixes pAI integrated light
 2017-09-14 13:22:27 -05:00
CitadelStationBot
59c7723e01 [MIRROR] Fix screwdrivers showing old cryo pods (#2763) 
* Fix screwdrivers showing old cryo pods

* Fix screwdrivers showing old cryo pods
 2017-09-14 13:19:38 -05:00
CitadelStationBot
9961ecabf1 [MIRROR] More admin auth fixes (#2769) 
* More admin auth fixes (#30688)

* More admin auth fixes
 2017-09-14 13:17:08 -05:00
CitadelStationBot
d156fecdbf [MIRROR] Fixes skinless species dropping human skin when gibbed (#2735) 
* Fixes skinless species dropping human skin when gibbed (#30649)

* fix gibbing skinless species

* = loc -> forceMove(loc)

* oops

* Fixes skinless species dropping human skin when gibbed
 2017-09-14 07:52:03 -05:00
CitadelStationBot
c6025a7049 [MIRROR] Adds some TRUE and FALSE (#2751) 
* This is not a refactor (#30670)

* Adds some TRUE and FALSE
 2017-09-14 07:38:27 -05:00
CitadelStationBot
fc62f8bf3e [MIRROR] Shuttle multi-tile object fix (#2748) 
* multi-tile object fix (#30674)

* Shuttle multi-tile object fix
 2017-09-14 07:37:54 -05:00
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
40e0bae912 [MIRROR] Nope (#2715) 
* Nope

* Update secrets.dm
 2017-09-13 22:50:15 -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
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
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
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
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
LetterJay
63c94a5c2b Merge branch 'master' into upstream-merge-30633 2017-09-13 08:00:06 -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
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
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
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