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
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
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
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
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
175224c5de
Merge branch 'master' into upstream-merge-29859
2017-08-29 21:14:45 -07:00
b9c58a2914
wew
2017-08-29 21:14:33 -07:00
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
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
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
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
eb0235792a
Singularities dig up asteroid turf
2017-08-19 18:41:38 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
1b2efdcc1d
More Initialize() garbage
2017-08-06 18:02:51 -05:00
8a4ddbe8a8
[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise ( #2162 )
...
* Ports Rapid Cable Layers from /vg/ and paradise
* rej clean up + manual sync
* maps and .rej file cleanup
* sprite and WGW memes
* actual spellchecked memes
* some other map fix memes
* fuck it, let's just hard sync maps
* dumb paperwork shit for maps
* Revert "dumb paperwork shit for maps"
This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.
* *autistic screeching*
* REEEEEEEEEEEEEEEEEEEEE
* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
0f23a00e40
Cleaned up some turf decals, fixed beach away mission ( #2152 )
2017-07-26 22:56:55 -07:00
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
49ee9d6cc9
roundstart AT cleanup ( #2103 )
2017-07-24 04:07:02 -07:00
0b7d08d5ac
Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 04:05:53 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
2892a3710d
[MIRROR] Adds collapsing stone tiles ( #1933 )
...
* Adds collapsing stone tiles
* Update necropolis_gate.dm
* Update necropolis_gate.dm.rej
* Delete necropolis_gate.dm.rej
2017-07-13 06:38:07 -07:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
5f6a2a999a
Chasms, asteroid turfs, basalt, and lava can no longer be made wet ( #1847 )
2017-07-01 21:21:24 -07:00
ac33b9defb
Adds some neat tiles and walls for use on lavaland
2017-06-26 09:19:17 -05:00
df815e99bd
Lavaland's default atmos is now a define
2017-06-21 08:32:00 -05:00
923c5b9035
Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881
...
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
2017-06-08 03:35:23 -05:00
bf4973e580
Refactor another spawn ( #1394 )
2017-06-04 09:04:32 -07:00
79ff2672b4
[MIRROR] Clean snow, lavaland, and thunderdome ( #1261 )
...
* Clean snow, lavaland, and thunderdome
* Delete mining.dm.rej
2017-06-02 22:01:46 -07:00
4f9c8a0869
Luxury Bluespace Shelter Capsules, Take 2.
2017-05-30 17:05:54 -05:00
a1ebd8c791
Refactors how diagonal smoothing underlays work ( #1187 )
2017-05-27 13:40:09 -07:00
d1db0044d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344
2017-05-22 11:52:18 -05:00
4e5617ad54
Megafauna and lavaland mobs will no longer spawn directly on top of the mining base
2017-05-21 22:28:10 -05:00
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
a681b306a6
[MIRROR] Buffs plasma and nerfs snow ( #924 )
...
* Buffs plasma and nerfs snow
* Update mineral.dm
* Delete mineral.dm.rej
2017-05-18 11:13:28 -05:00
6617f68604
[MIRROR] Harvesters are more fun to play ( #894 )
...
* Harvesters are more fun to play
* resolve .rej
2017-05-18 07:12:29 -05:00
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
d9908a74a7
Merge pull request #748 from Citadel-Station-13/upstream-merge-26808
...
[MIRROR] Adds aesthetic basalt floor tiles
2017-05-07 06:24:50 -07:00
b5a14bb6ab
New dirt sprites and jungle chasms
2017-05-04 18:38:58 -05:00
da781e0d76
Adds aesthetic basalt floor tiles
2017-05-04 06:12:26 -05:00
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
c38fa1eaa3
Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths ( #410 )
2017-04-15 15:01:54 -04:00
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
CitadelStationBot