Commit Graph

104 Commits

Author SHA1 Message Date
Poojawa
29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Ghommie
0e8f356610 Milk. 2019-03-11 11:54:40 +01:00
Trilbyspaceclone
9618fecfb7 Correct fans 2019-01-02 02:40:10 -05:00
Trilbyspaceclone
0b556a46af correct fans 2019-01-02 02:39:19 -05:00
Trilbyspaceclone
fc5b9117f2 Correct fans 2019-01-02 02:35:23 -05:00
Trilbyspaceclone
02761a38c9 Correct fans 2019-01-02 02:29:53 -05:00
Trilbyspaceclone
de551bc0c6 Revert "Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862)"
This reverts commit addea6f21c.
2019-01-02 02:21:23 -05:00
Trilbyspaceclone
addea6f21c Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862)
* Fixing updater

* Adds fans

* Adds fan

* Update whiteship_meta.dmm

* Update whiteship_delta.dmm
2018-12-31 03:05:39 -08:00
Tupinambis
a3678b0713 Adds an emag exclusive syndicate emergency shuttle. 2018-11-10 15:33:01 -06:00
Poojawa
c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
df7e625adb One day, while Bhjin was being lazy... 2018-09-11 13:03:53 -05:00
Poojawa
ec76f36099 plz fuck off with these map changes kthx 2018-09-11 12:51:45 -05:00
Poojawa
fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Jordan Brown
2cd16aa1ad Fix some shuttle chair stuff (#38557)
* Fix shuttle chair stuff

* Remove redundancy
2018-06-19 01:29:17 -05:00
LetterJay
7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539
[MIRROR] Adds New Shuttle Chairs
2018-06-18 21:58:42 -05:00
LetterJay
50da00b26c Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540
[MIRROR] Cleans up supermatter related varedits
2018-06-18 21:58:15 -05:00
LetterJay
90df70a8f1 Merge pull request #7134 from Citadel-Station-13/upstream-merge-38509
[MIRROR] Makes the caravan ambush ruin harder to cheese
2018-06-18 09:53:05 -05:00
fludd12
96b620d540 Adds New Shuttle Chairs (#38539)
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
2018-06-18 09:38:25 -05:00
81Denton
9b1f891a29 Cleans up supermatter related varedits (#38540)
* Cleans up supermatter related varedits

* reee

* fakecrystal
2018-06-18 09:38:16 -05:00
81Denton
e92060a3a9 Makes the caravan ambush ruin harder to cheese (#38509)
* makes caravan ambush more challenging

* SMASH
2018-06-16 15:38:34 -05:00
Dax Dupont
e5b95cfcdd Some minor pubby shuttle tweaks (#38489)
* Some minor pubby shuttle tweaks

* no step

* Good idea denton

* thanks guys
2018-06-16 06:17:57 -05:00
deathride58
255ffb96bb Merge branch 'master' into upstream-merge-38179 2018-06-05 21:32:22 +00:00
LetterJay
b94207ed11 Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223
[MIRROR] Slight changes to camera network code
2018-06-05 12:11:19 -05:00
iksyp
42e5ded9b3 fatsuits (#38233) 2018-06-03 11:05:45 -05:00
Jalleo
d3f34517dc Slight changes to camera network code 2018-06-03 09:04:24 -05:00
Jordan Brown
34f59b7a48 Merge pull request #38179 from AutomaticFrenzy/patch/pubby-aux
Fix Pubby auxiliary mining base
2018-06-01 09:48:37 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
CitadelStationBot
d62cb31e9b [MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884)
* Delete some duplicate macro definitions

* sql changelog changes ping the host

* Templates the caravan ambush ruin shuttles

* Update CODEOWNERS

* Update components.dm

* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile

* Initial Placeholder

* Update caravanambush.dmm
2018-05-27 19:27:56 -07:00
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Jordan Brown
de896c2929 Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z
Correct some pixel_z issues
2018-04-15 22:23:58 -05:00
ShizCalev
9879300633 Fixes duplicate docking port on aux base template 2018-04-11 07:32:09 -05:00
81Denton
50e139871c FUCKING COMPILE (#37051) 2018-04-10 17:02:35 -05:00
KorPhaeron
01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files 2018-04-01 09:42:14 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot
133bf4e224 [MIRROR] Cycle links pt.2: the linkening (#5659)
* Cycle links pt.2: the linkening (#35871)

* cyclelink 2: the linkening

* removes whiteship_box cycle link

* Cycle links pt.2: the linkening
2018-02-22 23:39:25 -06:00
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00
Jordan Brown
b785a048ff Merge pull request #35687 from ShizCalev/delta-whiteship
Fixes delta whiteship
2018-02-16 07:51:43 -06:00
deathride58
a11b073139 this shuttle got the axe for being too fun, comrade 2018-02-12 23:13:19 -05:00
deathride58
e3ad2643b2 maps first 2018-02-12 20:30:05 -05:00
Jordan Brown
ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 15:48:40 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359)
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
Dax Dupont
0f8b7da2a1 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 07:17:50 -06:00
CitadelStationBot
b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333)
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
2018-02-06 18:24:51 -06:00
CitadelStationBot
5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00