Commit Graph

107 Commits

Author SHA1 Message Date
BlackMajor
2bf35ec81c Nuclear fist 2019-12-14 02:15:09 +13:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Poojawa
ee5155bdbb fixes oddities 2019-10-06 04:27:46 -05:00
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
Ghommie
9ec97579bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-03 21:08:09 +02:00
Poojawa
2eac1b6ca2 Everything's working again, for now. 2019-08-17 08:04:18 -05:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Poojawa
c8d7f1909d holy FUCK I got gib overlays working. Why wasn't it before?
No one will ever know.
2019-08-01 00:58:24 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Ghommie
b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
Poojawa
7738c97b80 NYEH. fuckin' memes 2019-06-12 04:33:14 -05:00
Poojawa
26855d0698 Gibs spawn correctly. Just need to figure out the overlays now 2019-06-11 04:33:38 -05:00
Poojawa
69cefb604b just need to fine tweak gibs and we're gucci 2019-06-09 11:10:23 -05:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00
Poojawa
1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
Poojawa
9f80896280 eh, was going somewhere with this
IPC gibspawner, looking into infinite footprints
2019-05-26 05:36:33 -05:00
BurgerLua
bcf563e132 Fixes ass slapping to be less annoying. 2019-05-20 21:53:47 -07:00
JTGSZ
6c077758c6 ports gang 2019-05-18 05:06:22 -04:00
Poojawa
0f6677b956 Blood colors happens to footprints now.
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
2019-05-16 08:23:53 -05:00
Poojawa
1a047c0068 I think I got it.
Also gibs should be better too.
2019-05-12 04:06:35 -05:00
Poojawa
773a94dea6 I really dunno at this point, weh 2019-04-17 06:28:07 -05:00
Poojawa
fe6407d00c I need to do something else for a bit pending reviews 2019-04-17 04:33:56 -05:00
Poojawa
73098574b7 what to do when footprints are being a bitch.
why, we get rid of them :honk:
2019-04-17 01:18:21 -05:00
Poojawa
a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Poojawa
33c41e80c0 pretty sure I'm onto it 2019-04-13 04:33:40 -05:00
Poojawa
60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
Bear
c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
dcb446727a Icon sync double checked for > 2mo last update 2018-09-11 00:03:21 -05:00
Letter N
6f84c924e1 ser.lazy == true (#7453) 2018-08-12 17:37:36 -07:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04: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
Poojawa
1bbe495740 icons 2018-04-23 03:54:37 -05:00
AnturK
8a3caaae6b Mapping component helper (#37314)
* Mapping component helper

* GetAllContents so you can manipulate things in crates/onmobs/whatever

* More verbose warning.
2018-04-22 19:18:17 -05:00
CitadelStationBot
9892fabe4e [MIRROR] Restores empty state to 96x96.dmi (#6109)
* Restores empty state to 96x96

* Restores empty state to 96x96.dmi
2018-03-26 04:31:17 -05:00
Qustinnus
f7a8a96536 Lavaland / Lavaplanet is now visible from space (#36419)
* adds lava planet

* fixes oldcode

* im dumb

* Random position

* UHHHH, I'll take a diet lavaplanet please, no ice.

* fixes init
2018-03-17 07:54:21 -05:00
CitadelStationBot
534c4fcc18 [MIRROR] Space Parallax Tweak (#5806)
* Space Parallax Tweak (#36137)

* Tweaked contrasts

Upped the contrast on layer 1.
Tweaked the saturation to layer 2.

* more saturation and contrast

* tweak

* .

* Revert "."

This reverts commit 9590c657bac2c3afed007c82a7d05d36fd4249a6.

* Revert "Revert ".""

This reverts commit 6b9adf4d3fc13d6d3d934cc3eb9ea464c432c414.

* polish

* DO YOU SEE?

* Space Parallax Tweak
2018-03-06 12:28:22 -06:00
CitadelStationBot
8543df055d [MIRROR] Add parallax sprites from RIS (#5749)
* Add parallax sprites from RIS (#36049)

* Add files via upload

* Update parallax.dm

* Add parallax sprites from RIS
2018-03-02 18:35:35 -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
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
0c74a7eede [MIRROR] Holorays! (#5261)
* Holorays!

* adding missing .dmi
2018-02-05 01:10:29 -06:00
Poojawa
4ce8f9ec80 clean up icons folder of unused .dmis 2018-01-31 07:38:58 -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
ShizCalev
6ed56158e3 Adds new landmark icons (#34848)
* Adds new landmark icons

* Update

* Blue
2018-01-24 18:08:33 -06:00
LetterJay
d60e61ecbc Merge pull request #4988 from Citadel-Station-13/upstream-merge-34691
[MIRROR] Fix Bananium Ore Overlay
2018-01-21 11:56:40 -06:00
uraniummeltdown
5f53625f0b fix bananium ore overlay 2018-01-21 02:56:07 -06:00