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

3768 Commits

Author SHA1 Message Date
LetterJay
32fc4ee514 Update synths.dm 2017-09-19 11:16:58 -05:00
KorPhaeron
d104c1d76c Prevents the creation of Shadowzombiechangelings 2017-09-15 03:08:07 -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
Poojawa
8a2ec7d39a Update radiation_storm.dm 2017-09-14 13:32:48 -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
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
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
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
d86060dcff [MIRROR] Lobby music won't be the same as the last round (#2727) 
* Merge pull request #30636 from Cyberboss/NoDupeMusic

Lobby music won't be the same as the last round

* Lobby music won't be the same as the last round
 2017-09-14 07:51:34 -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
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
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