Commit Graph

360 Commits

Author SHA1 Message Date
deathride58
fef23bd7cc Merge pull request #5594 from Poojawa/Tweaks
fixes possible missing sprites
2018-02-20 03:37:39 +00:00
Poojawa
91c9434404 fixes possible missing sprites 2018-02-19 20:03:02 -06:00
CitadelStationBot
5a532dd606 [MIRROR] Sheet icon fixes (#5585)
* Sheet icon fixes

* Update sheet_types.dm
2018-02-19 10:21:32 -06:00
LetterJay
8483f94d5f Blood Red Tie - Donator Loadout (#5579)
* donation item

* path cleanup

* ditto

* Update __donator.dm
2018-02-18 19:37:10 -06:00
Poojawa
d2d1315b13 fixes shepards, adjusts fox markings 2018-02-18 06:41:14 -06:00
Poojawa
3255bfbdbf sergal head stuffs
husky markings too
2018-02-18 04:48:02 -06:00
LetterJay
e809725afd Merge pull request #5525 from jakeramsay007/slimepeoplerework
[Ready!] The Slimening - Reworking slimepeople to be less like humans without unbalanced advantages.
2018-02-17 11:51:45 -06:00
Chayse Ramsay
29bdef8664 New UI icon 2018-02-16 21:14:55 +00:00
Slignerd
cbe4734216 Changes a number of HUD icons (#35704)
* Updates hud.dmi

* Makes clown's nose big again

* Updates contraband balloons

* Changes HUD icons and HUD-themed balloons
2018-02-16 10:34:45 -06:00
Chayse Ramsay
482c21b296 Slimepeople Rework 2018-02-16 12:44:23 +00:00
TehZombehz
326238e59f Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:48 -06:00
oranges
e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -06:00
Nick
8ef7eea4fa Merge branch 'master' into bunnypack 2018-02-09 07:10:12 +01:00
Improvedname
464077ef3a bunni 2018-02-08 20:31:26 +01:00
Jordan Brown
bbf970c213 Merge pull request #35409 from epochayur/master
Belts now have inhand sprites
2018-02-07 23:48:17 -06:00
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168)
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
2018-02-07 20:23:32 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297)
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
2018-02-05 04:42:13 -06:00
CitadelStationBot
3a7d148417 [MIRROR] Soap now has inhand sprites (#5257)
* Soap now has inhand sprites (#35159)

* Delete items_lefthand.dmi

* Add files via upload

* Delete items_righthand.dmi

* Add files via upload

* Delete custodial_lefthand.dmi

* Delete custodial_righthand.dmi

* Add files via upload

* Delete items_lefthand.dmi

* Delete items_righthand.dmi

* Add files via upload

* Update clown_items.dm

* Soap now has inhand sprites
2018-02-04 22:35:31 -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
9b976b1c04 fixes missing hands sprites 2018-02-02 17:45:13 -06:00
Poojawa
01c4b6caf8 ALWAYS KEEP THE REFS UP TO DATE NERDS 2018-01-31 10:22:30 -06:00
Poojawa
2f16174e7c overdue refractor on layering code
also probably fixes missing sprites
2018-01-31 10:13:17 -06:00
Poojawa
4ce8f9ec80 clean up icons folder of unused .dmis 2018-01-31 07:38:58 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
LetterJay
7ac807afa6 Merge pull request #5184 from Citadel-Station-13/upstream-merge-34849
[MIRROR] Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC
2018-01-31 04:07:37 -06:00
LetterJay
58da631638 Merge pull request #5192 from Citadel-Station-13/upstream-merge-34599
[MIRROR] adds extendohands
2018-01-30 23:16:22 -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
CitadelStationBot
02b3e47fc3 [MIRROR] Cosmic Bedsheet (#5170)
* adds cosmic space bedsheet

* Cosmic Bedsheet
2018-01-30 07:31:26 -06:00
PKPenguin321
e4dd53a89f adds extendohands (#34599)
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
2018-01-29 21:56:44 -06:00
Ashe Higgs
597b2864eb Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC (#34849)
* Do you want to play a game?

* removes leftover code from earlier dev

* Some things

* optimizations, from the heart, for the soul
2018-01-29 21:55:27 -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
Ashe Higgs
be9f8a2d06 Refactors and nerfs Fleshmend 2018-01-24 13:56:20 -06:00
ShizCalev
fb86cf6878 Fixes syringe icons (#34704) 2018-01-22 12:01:02 -06:00
Lexorion
5f3653f4a5 Adds new eldritch longsword sprite (#34678)
* updates the eldritch longsword sprite

* properly rewinds the left inhand animation
2018-01-21 04:17:51 -06:00
Ashe Higgs
c9224a3185 allows servants to cancel warps more intuitively by clicking on the button again (#34504)
* lets you cancel cc warps

* runtimestation
2018-01-19 09:57:57 -06:00
Vivinet
671a1c12f4 Male chest fix + hand fix
Made it so that the eastward facing xeno male chest was a mirrored version of the westward male chest, not the female one as it was originally.

Mirrored the westward facing right arm with the eastward facing left arm.
2018-01-18 19:01:20 -08:00
Vivinet
18fa25cc17 Temp. Xeno Eye Fix - Leg Addition
Added:
-The option to select eye color for xenos so players selecting this species can blend in the eyes with the head. The eyes weren't originally there but due to upstream changed are now rendered as white, souless eyes.
- Using the lizard normal leg sprites, added the option for the xeno species to use normal legs or digi-grade ones.
2018-01-18 18:20:58 -08:00
ShizCalev
8bd1f07353 Fixes pet collars not updating icons (#34184) 2018-01-12 06:17:04 -06:00
LetterJay
7c2662f1de custom item 2018-01-11 15:25:47 -06:00
Leo
47f361e67c Merge pull request #34252 from ShizCalev/beepsky-sprite-fix
Fixes secbot sprites
2018-01-11 09:45:47 -06:00
deathride58
d1cec46035 aND FINALLY THE REST OF THE CODEBASE HOLY FUCK ITS DONE 2018-01-04 02:03:42 -05:00
oranges
3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -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
kevinz000
bf7838aded [READY]Adds picking up corgis and pAIs! 2017-12-27 15:47:57 -06:00
LetterJay
0381491643 oops 2017-12-27 07:08:26 -06:00
LetterJay
5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
kevinz000
bec20087c2 [READY]Clownborgs - ADMIN SPAWN ONLY 2017-12-22 10:58:13 -06:00
oranges
4e8898d55f Merge pull request #33714 from lzimann/icon
Job landmarks now show the mob with the proper job outfit.
2017-12-21 19:27:23 -06:00