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

156 Commits

Author SHA1 Message Date
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
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
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
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
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
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
LetterJay
01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
tortellinitony
d73b82cf11 Gets rid of manual overlay manipulation 2017-09-06 23:39:08 -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
44c3aecb3b Merge pull request #2549 2017-08-29 22:38:57 -07:00
kevinz000
f982cd1d5a Merge pull request #2550 2017-08-29 22:38:54 -07:00
kevinz000
0f37872fb5 Merge pull request #2463 2017-08-29 22:27:27 -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
kevinz000
408acdd66d sync 2017-08-29 22:05:16 -07:00
kevinz000
175224c5de Merge branch 'master' into upstream-merge-29859 2017-08-29 21:14:45 -07:00
kevinz000
b9c58a2914 wew 2017-08-29 21:14:33 -07:00
kevinz000
4faa0d6104 Merge branch 'master' into upstream-merge-30244 2017-08-29 20:06:07 -07:00
CitadelStationBot
719717934c Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it 2017-08-29 17:10:59 -05:00
CitadelStationBot
4dc8a1adbc Workaround to prevent slippery components from flooding SSgarbage 2017-08-29 17:09:53 -05:00
kevinz000
911e1fa194 sync 2017-08-29 09:43:10 -07:00
kevinz000
301a581e64 sync 2017-08-29 09:41:11 -07:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJay
27750d91d6 Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214 
[MIRROR] Removes the suppose-to-be unused shuttle wall path
 2017-08-28 09:01:47 -05:00
CitadelStationBot
12ff0e7406 Removes the suppose-to-be unused shuttle wall path 2017-08-28 02:20:45 -05:00
CitadelStationBot
0a4efdcc8f Switched dirtystation to use typecaches for checks 2017-08-28 02:20:06 -05:00
CitadelStationBot
94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
eb0235792a Singularities dig up asteroid turf 2017-08-19 18:41:38 -05:00
LetterJay
6dd7c44bbc Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829 
[MIRROR] Merges the two turf/Entereds
 2017-08-18 13:41:23 -05:00
LetterJay
3c91fba8e3 Update turf.dm 2017-08-18 11:16:30 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
16428315aa Merges the two turf/Entereds 2017-08-13 18:01:40 -05:00
CitadelStationBot
e354c9f289 Fixes turf slipping 2017-08-13 18:00:36 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
1b2efdcc1d More Initialize() garbage 2017-08-06 18:02:51 -05:00
CitadelStationBot
f5bc18bb55 buildmode fix + blueprints fix (#2261) 
* Fixes Admin Buildmode Mass-Deletion making people nude, gives GetAllContents() an ignore typecache.

* sync turf.dm
 2017-08-04 11:46:11 -07:00
CitadelStationBot
ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot
d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039) 
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
 2017-08-03 06:12:27 -07:00