shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,362 Commits 5 Branches 0 Tags
6581eb8526e9efe8ebea611cca43658bd650ca3c
Commit Graph

135 Commits

Author SHA1 Message Date
LetterJay
73f54f340f Merge pull request #3770 from Citadel-Station-13/upstream-merge-32328 
[MIRROR] Refactors the RCD code a tiny bit. One minor balance change
 2017-11-03 00:14:58 -05:00
LetterJay
443b49f7f2 Merge pull request #3758 from Citadel-Station-13/upstream-merge-32306 
[MIRROR] Fix double progress bars when digging basalt
 2017-11-03 00:11:51 -05:00
Jalleo
76bce07100 Refactors the RCD code a tiny bit. One minor balance change (#32328) 
* Refactors the RCD code a tad to remove a variable from all RCD's and instead get the reinf_walls.dm checks to be a compiled check with a istype.

* Reverts back to variables for the reinforced walls check. Still reduced the amount of nessecary lines for it though
 2017-11-02 13:55:46 -05:00
Tad Hardesty
6f06e690a4 Fix double progress bars when digging basalt (#32306) 2017-11-02 04:11:07 -05:00
Emmett Gaines
eb52a61437 makes walls call parent (#32309) 2017-11-02 04:08:44 -05:00
Jordan Brown
82c388b3e8 Makes thermite a component 2017-10-27 17:36:38 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
LetterJay
481a3ef518 Merge pull request #3470 from Citadel-Station-13/upstream-merge-31788 
[MIRROR] Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles.
 2017-10-18 07:36:55 -04:00
ShizCalev
272fcc0b5d Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles. (#31788) 
* Stops plating types from stating rod holes

* More immersion. Stops building ontop with rods.
 2017-10-17 13:37:25 -05:00
Leo
88486f97ca Merge pull request #31795 from AnturK/random-runtimes 
Random runtime fixes.
 2017-10-17 09:20:55 -05:00
LetterJay
a11a474a94 Merge pull request #3416 from Citadel-Station-13/upstream-merge-31698 
[MIRROR] Prevents tiles from being placed on top of buckled mobs
 2017-10-16 07:09:30 -04:00
Leo
0380e43f33 Merge pull request #31698 from duncathan/atmos-patch7 
Prevents tiles from being placed on top of buckled mobs
 2017-10-15 14:02:02 -05:00
Jordan Brown
4e4f2fa19d Merge pull request #31713 from vuonojenmustaturska/initializefixesoct 
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
 2017-10-15 11:32:05 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
LetterJay
c442f49cde Merge pull request #3373 from Citadel-Station-13/upstream-merge-31645 
[MIRROR] Cleans up explosives at syndie base
 2017-10-14 10:20:27 -04:00
LetterJay
2e61af534e Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420 
[MIRROR] Bullet decals tweak
 2017-10-14 10:17:18 -04:00
LetterJay
8aebc3b15a Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909 
[MIRROR] Radiation rework and subsystem
 2017-10-13 23:58:04 -04:00
ShizCalev
c7afe4f70e Cleans up explosives at syndie base ruin (#31645) 2017-10-13 16:29:36 -05:00
nicbn
921b65ced0 Bullet decals tweak (#31420) 
* wee

* screen clock update

* resist and stop pulling

* Whoop, Joan messed up on the selection border so here's some fixed icons for that

* there we go

* Update walls.dm

* Update walls.dm

* Update walls.dm
 2017-10-13 09:47:10 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan Brown
9d448fda76 Merge pull request #31602 from AnturK/tunnels 
Fixes diagonal tunnels
 2017-10-13 09:14:34 -05:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
oranges
cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 03:05:32 -05:00
LetterJay
9ee8b6298f Merge pull request #3133 from Citadel-Station-13/upstream-merge-31275 
[MIRROR] Adds deconstruction hints to various things
 2017-10-04 18:44:50 -04:00
oranges
25cf971fef Merge pull request #31275 from kingofkosmos/moredeconhints 
Adds deconstruction hints to various things
 2017-10-04 16:33:51 -05:00
kevinz000
1a3fc9f1c6 why plus a minus value and not just minus the value... (#31279) 
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
 2017-10-04 14:03:20 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605 
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
 2017-10-01 16:30:40 -04:00
LetterJay
f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
kingofkosmos
0f387451f7 You can now examine an airlock to find out how to construct/deconstruct it (#30605) 
* Tweaks rwall construction examine-messages.

* Tweaks window construction examine-messages.

* Added airlock construction examine messages.

* Typo fix.

* Shortened the airlock electronics circuit message.

* Fixed examine text styles.

* Fixes.

* Fixed wall-examine showing on rwalls.

* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.

* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.

* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.

* Removed unnecessary rwall-examine.

* Sound full path.
 2017-10-01 00:04:14 -05:00
LetterJay
6d59f3b06f Update misc_walls.dm 2017-09-30 14:19:40 -05:00
LetterJay
b88081e106 Update misc_floor.dm 2017-09-30 14:19:27 -05:00
Joan Lung
e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
vuonojenmustaturska
11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
CitadelStationBot
2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857) 
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
 2017-09-22 23:35:22 -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
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
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
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
Joan Lung
2dc3868949 Makes shiny versions of lavaland monsters slightly more distinct (#30502) 
* Makes shiny versions of lavaland monsters slightly more distinct

* classic

* lower drop

* tweak drops

* this is kind of absurd
 2017-09-11 20:54:55 -05:00
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
LetterJay
92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
CitadelStationBot
e70b6ceb33 Chasms will alert mobs below them when they form 2017-08-30 17:06:38 -05:00
kevinz000
f982cd1d5a Merge pull request #2550 2017-08-29 22:38:54 -07:00
kevinz000
9cb65df70d Merge pull request #2426 2017-08-29 22:27:21 -07:00
kevinz000
5c7b743cfa Merge pull request #2405 2017-08-29 22:27:10 -07:00