5869f72980
Merge pull request #11776 from zeroisthebiggay/supritoburritoemittercarbines
...
cool emitter carbine resprite
2020-04-11 02:03:14 +02:00
f60cf32562
Merge pull request #11775 from Trilbyspaceclone/frail-crafting
...
Frail crafting - Glass work additions and changes!
2020-04-09 02:41:01 -07:00
956a85ab34
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
...
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
f4ce4e07f7
i did the thing
2020-04-07 20:37:14 -04:00
e9d2e798a3
more glasswork
2020-04-07 17:58:23 -04:00
d1e77ab087
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:31:16 +10:00
a6bd6d23fe
Some cleanup with help from rohesie, hopefully I figured it out
2020-04-06 12:28:14 +10:00
adeb61180c
big floof
2020-04-06 01:09:25 +01:00
71e19aead2
ports over my krav changes from tg and also hooked in pugilist gloves to summon equipment for cultists and gave all that shit a sprite ye
2020-04-04 16:29:29 +11:00
e23bacdf6b
Icons
2020-04-01 13:03:31 +03:00
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
4de14fbdf7
Finnishing touches
2020-04-01 12:59:06 +03:00
dce23a40af
God i wish i could auto merge icons
2020-04-01 12:05:53 +03:00
24d9045679
papermask sprites bigger edition
2020-03-31 01:47:43 -07:00
dd90d21f93
Merge pull request #11645 from Trilbyspaceclone/vaild
...
Et tu?
2020-03-28 15:58:56 -07:00
eb84d426e1
Merge pull request #11634 from Ghommie/Ghommie-cit645
...
Fixing a couple issues with sofas.
2020-03-27 21:25:31 -07:00
879b626cd1
Et tu
2020-03-27 03:12:04 -04:00
ef3106aab6
Fixing a couple issues with sofas again.
2020-03-26 19:24:56 +01:00
388e6d46df
Merge pull request #11603 from KathrinBailey/Kat-Furniture
...
Kat Shutter Balancing & Sprite Updates: COVID-19 Shut-In Edition
2020-03-25 12:22:42 -07:00
134d861fd7
KAT SHUTTERS ALL OF THE STUFF
...
Checked: Animations timings, the buttons in-game (they open and close), the radiation insulation (rad shutters don't block rads once open but do once closed, 0.2x multiplier to rads). Animations all play and the shutters actually open and close.
2020-03-24 20:13:48 +00:00
f8147e5a85
Ports over Mortars and Pestles ( #11546 )
...
* 2 ports for the commit of 1!
ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086
* what if we didnt have that...
* Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-24 14:03:31 +01:00
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
fbe77495e8
Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020
...
Porting Juices, Drinks, and Salami [READY]
2020-03-23 10:36:44 -07:00
0effeb6ed5
Ports Hyper Drinks
...
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
2020-03-22 19:33:50 -04:00
cd3f8f5df5
Porting More Stuff
...
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
2020-03-22 15:13:00 -04:00
5c3037b5d0
Fixed Several Foods, Strawberry Juice
...
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783
Made lizards like:
Egg Wrap
Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
2020-03-22 00:19:28 -04:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
93b1ade0bc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
...
# Conflicts:
# code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00
570f6e8a66
Plastitanium Rapier: Sleepy Edition ( #11507 )
...
* knockout rapier, improved sprites
* it's a rapier not a foil those aren't synonyms
* whoops
* needs it's shanking sound
* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!
* Update items_and_weapons.dmi
* Removes chat spam and also frankly it doesn't need drowzy on top
2020-03-20 16:07:04 +01:00
35a4d71a54
im sorry little one
2020-03-19 21:59:14 -04:00
2b11b7ac95
Energy Gun Sprite cleanup and Animations ( #11518 )
...
* Sprite changes and animations by goldnharl
* While I'm here I'll port over a sprite from tg for the disabler
2020-03-20 02:37:57 +01:00
6b392e09c2
Merge remote-tracking branch 'upstream/master' into hudpatches
2020-03-17 16:29:13 -05:00
72f086c79e
one at a time perhaps.
2020-03-17 16:24:23 -05:00
e8d09b470d
nobody can figure out why this isn't working :)
2020-03-17 16:22:42 -05:00
af872d1476
push
2020-03-17 16:10:15 -05:00
37aaac60e3
third times the charm
2020-03-17 16:07:25 -05:00
f7c9762583
icon conflicts suck
2020-03-17 16:00:24 -05:00
93ceaa0157
Revert "h^2"
...
This reverts commit df45abfd0f
2020-03-17 15:56:57 -05:00
df45abfd0f
h^2
2020-03-17 15:55:07 -05:00
c97591cc8f
h
2020-03-17 15:54:17 -05:00
8bc8ea71ea
Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix
...
Electrostaff Sprite Fix
2020-03-17 09:25:44 -07:00
5d134539ad
wait no this does need another sprite goddamnit why does it work like this
2020-03-17 02:56:19 +11:00
b5872bba63
Pretty sure this should now use the correct sprites
2020-03-17 02:43:44 +11:00
19fd006103
Fixed some missing sprites
2020-03-17 02:12:28 +11:00
94f694e568
adds some hudpatches
...
seemed like fun flavor, inspired by bay and a request.
2020-03-16 01:44:26 -05:00
5a04b43db4
duffel baaaaaaaaaaags
2020-03-14 16:12:17 +08:00
3ae8016ec8
Merge pull request #11373 from kappa-sama/supershotty
...
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -07:00
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
832d894e92
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
...
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
e210f7d535
Merge pull request #11391 from Ghommie/Ghommie-cit612
...
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
Ghom