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

209 Commits

Author SHA1 Message Date
Jordan Brown
82c388b3e8 Makes thermite a component 2017-10-27 17:36:38 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
Jordan Brown
fa433109ce Transit space blocks explosions 2017-10-24 15:47:53 -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
ec41bbc420 Merge pull request #3422 from Citadel-Station-13/upstream-merge-31733 
[MIRROR] closed turfs remove themselves from SSair.high_pressure_delta on change
 2017-10-16 07:25:44 -04: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
duncathan salt
3da718d3b1 closed turfs remove themselves from SSair.high_pressure_delta on change (#31733) 2017-10-15 19:32:20 -05: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
581ea5ac48 Merge pull request #3382 from Citadel-Station-13/upstream-merge-31655 
[MIRROR] Slight change to the behavior of Assimilate_Air()
 2017-10-14 15:38:21 -04: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
oranges
dd8fb2a5ad Merge pull request #31655 from duncathan/atmos-patch1 
Slight change to the behavior of Assimilate_Air()
 2017-10-13 23:50:05 -05: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
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
LetterJay
fe2e29f0f8 Merge pull request #3210 from Citadel-Station-13/upstream-merge-31388 
[MIRROR] Moves assert_gas() into a define it should always have been, speeding up atmos slightly
 2017-10-08 16:19:12 -04:00
Jordan Brown
4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -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
LetterJay
0b7ef4d90f Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233 
[MIRROR] Fixes floating bullet holes
 2017-10-03 12:31:59 -04:00
Leo
a64e2fd25e Merge pull request #31233 from kevinz000/patch-306 
Fixes floating bullet holes
 2017-10-03 06:18:41 -05:00
vuonojenmustaturska
ebca0173f3 makes /turf/Enter() faster, and also makes CollidedWith async (#31217) 
* makes /turf/Enter faster, maybe

* waitfor false on atom/collidedwith
 2017-10-03 04:33:23 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
018300507a Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162 
[MIRROR] Fixes plasma cutters only hitting one tile
 2017-10-01 16:32:24 -04: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
kevinz000
b13f2012fb Update closed.dm 2017-10-01 08:42:26 -05:00
LetterJay
81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763 
[MIRROR] Configuration datum refactor
 2017-10-01 02:50:17 -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
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04: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
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJay
781b0359ae Merge pull request #2993 from Citadel-Station-13/upstream-merge-30714 
[MIRROR] Shooting walls can create bullet holes/dents
 2017-09-29 01:44:54 -04:00
Joan Lung
e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
KorPhaeron
bdae94f60c Shooting walls can create bullet holes/dents (#30714) 
* Bullet holes in walls

* Code standards, new sprite
 2017-09-28 21:48:27 -05:00