shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,380 Commits 5 Branches 0 Tags
fafdf339ff6d3deecb816b190845b0862dabbf77
Commit Graph
200 Commits
Author SHA1 Message Date
LetterJayandGitHub 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
LetterJayandGitHub 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 saltandCitadelStationBot 3da718d3b1 closed turfs remove themselves from SSair.high_pressure_delta on change (#31733) 2017-10-15 19:32:20 -05:00
LeoandCitadelStationBot 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 BrownandCitadelStationBot 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 GainesandCitadelStationBot 24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 2e61af534e Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420 
[MIRROR] Bullet decals tweak
 2017-10-14 10:17:18 -04:00
orangesandCitadelStationBot 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
LetterJayandGitHub 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
ShizCalevandCitadelStationBot c7afe4f70e Cleans up explosives at syndie base ruin (#31645) 2017-10-13 16:29:36 -05:00
nicbnandCitadelStationBot 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 GainesandCitadelStationBot 55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan BrownandCitadelStationBot 9d448fda76 Merge pull request #31602 from AnturK/tunnels 
Fixes diagonal tunnels
 2017-10-13 09:14:34 -05:00
Jordan BrownandCitadelStationBot 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
LetterJayandGitHub 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 BrownandCitadelStationBot 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 BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
orangesandCitadelStationBot cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 03:05:32 -05:00
LetterJayandGitHub 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
orangesandCitadelStationBot 25cf971fef Merge pull request #31275 from kingofkosmos/moredeconhints 
Adds deconstruction hints to various things
 2017-10-04 16:33:51 -05:00
kevinz000andCitadelStationBot 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
LetterJayandGitHub 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
LeoandCitadelStationBot a64e2fd25e Merge pull request #31233 from kevinz000/patch-306 
Fixes floating bullet holes
 2017-10-03 06:18:41 -05:00
vuonojenmustaturskaandCitadelStationBot 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
KorPhaeronandCitadelStationBot 3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
kevinz000andCitadelStationBot b13f2012fb Update closed.dm 2017-10-01 08:42:26 -05:00
LetterJayandGitHub 81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763 
[MIRROR] Configuration datum refactor
 2017-10-01 02:50:17 -04:00
LetterJayandGitHub f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
kingofkosmosandCitadelStationBot 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
LetterJayandGitHub 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJayandGitHub 6d59f3b06f Update misc_walls.dm 2017-09-30 14:19:40 -05:00
LetterJayandGitHub b88081e106 Update misc_floor.dm 2017-09-30 14:19:27 -05:00
LetterJayandGitHub 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJayandGitHub 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 LungandCitadelStationBot e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
KorPhaeronandCitadelStationBot 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
Jordan BrownandCitadelStationBot e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
Emmett GainesandCitadelStationBot 16f1ceedd1 GetAllContents performance increase (#31027) 2017-09-28 10:44:28 -05:00
Ashe HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
vuonojenmustaturskaandCitadelStationBot 11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 597c02135a [MIRROR] Maybe fix shuttle issues (#2841) 
* Merge pull request #30819 from MrStonedOne/patch-425

Maybe fix shuttle issues

* Maybe fix shuttle issues
 2017-09-17 21:35:42 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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