Commit Graph

461 Commits

Author SHA1 Message Date
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -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
Dax Dupont
1cc06510ec Fixes crematorium on meta/box. (#35305) 2018-02-05 11:01:57 -06:00
CitadelStationBot
92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291)
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
2018-02-05 05:36:09 -06:00
CitadelStationBot
98d18ee7e3 [MIRROR] Removes tripai landmark (#5280)
* Removes tripai landmark

* Update landmarks.dm
2018-02-05 04:44:31 -06:00
CitadelStationBot
5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
CitadelStationBot
ec127471e8 Makes departemental lathes easier to access. (#5274) 2018-02-05 02:09:16 -06:00
CitadelStationBot
5aec2724c1 [MIRROR] The firelock on Box's circuit lab no longer covers up the room's airlock (#5270)
* Moves the circ. lab firelock down a tile (#35217)

* The firelock on Box's circuit lab no longer covers up the room's airlock
2018-02-04 23:02:01 -06:00
CitadelStationBot
799038ab26 [MIRROR] blasts away a double stacked blast door in atmosia (#5240)
* blasts away a double stacked blast door in atmosia

* blasts away a double stacked blast door in atmosia
2018-02-04 22:20:26 -06:00
deathride58
30ab115665 Makes Cit widescreen by default (#4374)
* updates title screen to be WIDESCREEN

* increase default size of view window

* widescreen fullscreen overlays

* and finally, the switch can be hit

* Update skin.dmf

* readds splitter=75, the main screen breaks without it
2018-02-04 21:29:48 -06:00
Poojawa
faccc43461 fucking github REEEEEEEEEEE 2018-01-31 18:33:46 -06:00
Poojawa
ebf5366e73 Delta was apparantly a github copy/paste wtf 2018-01-31 18:23:42 -06:00
Poojawa
cf537cd417 Removing abandon map. 2018-01-31 11:18:41 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
LetterJay
391e317451 Merge pull request #5220 from Citadel-Station-13/upstream-merge-35113
[MIRROR] Morgue and Crematorium Repositions
2018-01-31 04:14:27 -06:00
LetterJay
eb49ebcce5 Merge pull request #5158 from Citadel-Station-13/upstream-merge-35073
[MIRROR] Fixes bad APC name on Boxstation
2018-01-31 03:02:19 -06:00
Jittai
f8bf40e7cc Morgue and Crematorium Repositions 2018-01-31 02:21:45 -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
Jordan Brown
b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant
Makes revenants spawn on dead bodies & bodycontainers
2018-01-28 18:03:41 -06:00
Leo
d4fb182401 Merge pull request #35073 from ShizCalev/box-fixes
Fixes bad APC name on Boxstation
2018-01-28 16:22:56 -06:00
FrozenGuy5
a77e139fd8 Changes up the Construction Area on Box slightly. 2018-01-28 14:33:41 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466
[MIRROR] Fake nuclear disks are even more convincing
2018-01-25 13:41:02 -06:00
MMMiracles
521e309da4 baseturf editors on syndicate base (#34815) 2018-01-24 15:43:33 -06:00
LetterJay
937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769
[MIRROR] Cleans up unused mob vars
2018-01-24 13:56:23 -06:00
Jordan Brown
d7975510e4 Fixes omega missing a wheat fridge and runtiming pipenets 2018-01-24 06:12:20 -06:00
Leo
90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup
Cleans up unused mob vars
2018-01-23 06:44:32 -06:00
coiax
f425c5496f Fake nuclear disks are even more convincing 2018-01-23 01:41:21 -06:00
Leo
b59c8c6e71 Merge pull request #34581 from ShizCalev/stacked-turf-cleanup
Corrects some stacked turf
2018-01-19 08:16:31 -06:00
ShizCalev
f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
deathride58
d7e2967bc8 Merge pull request #4891 from Citadel-Station-13/upstream-merge-34502
[MIRROR] Update Space Station 13 decal on RuntimeStation
2018-01-17 20:13:17 +00:00
Jordan Brown
ed95343715 Merge pull request #34502 from AutomaticFrenzy/patch/runtime-decal
Update Space Station 13 decal on RuntimeStation
2018-01-16 14:47:02 -06:00
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-16 14:37:26 -06:00
Emmett Gaines
a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
oranges
8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 04:23:03 -06:00
oranges
8b4788a884 Merge pull request #34101 from ShizCalev/got-a-light-
Removes omnizine (traitor) cigarettes from captain's office on Meta
2018-01-11 14:05:06 -06:00
deathride58
9a33ac7177 TGUI recompile, fixes map conflicts 2018-01-11 00:05:34 -05:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
deathride58
fcad1432a9 readds citadel specific map changes 2018-01-07 17:04:51 -05:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
ShizCalev
53d7dfbb9b Fixes meta toxins lab (#34087) 2018-01-05 06:01:27 -06:00
deathride58
9834c3a499 merges #4665 2018-01-04 22:52:05 -05:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay
d8e85b5f15 Merge pull request #4613 from Citadel-Station-13/upstream-merge-33945
[MIRROR] Improves loot drop spawners, adds AI law spawners to cores
2017-12-31 02:52:44 -06:00
vuonojenmustaturska
9dd9d9413a Improves loot drop spawners, adds AI law spawners to cores (#33945)
* hymn to breaking strain

* remove subtypes as requested

* no-one saw that
2017-12-31 02:27:12 -06:00
Jordan Brown
a89f221d35 Removes chemist job from omegastation (#33863)
* Removes chemist job from omegastation

* Remove chemist start points
2017-12-30 16:04:36 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00