SandPoot
072087ec14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-15 20:22:44 -03:00
SandPoot
b955bc222b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter
2023-02-06 20:24:35 -03:00
SandPoot
996e472f80
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-03 18:53:29 -03:00
Timothy Teakettle
7e77bc8023
Merge pull request #15963 from zeroisthebiggay/sickkicks
...
sick kicks: tg/skyrat boot sprite theft
2023-02-03 09:54:04 +00:00
Timothy Teakettle
f40584685b
Merge pull request #15952 from zeroisthebiggay/sabre
...
very ready sabre resprite and minor sprite tweaks
2023-02-03 09:53:15 +00:00
Timothy Teakettle
560fbd3ffb
Merge pull request #15956 from zeroisthebiggay/posters
...
poster resprite bottom text
2023-02-03 09:52:48 +00:00
zerothebigboy
d93dcf5b76
sickkicks
2023-02-01 08:25:30 -05:00
Timothy Teakettle
c357986b62
Merge pull request #15957 from zeroisthebiggay/wendigo
...
the tg wendigo resprite
2023-02-01 00:53:55 +00:00
Timothy Teakettle
6723c0166e
Merge pull request #15960 from zeroisthebiggay/glasses
...
the tg gloves resprite
2023-02-01 00:53:42 +00:00
Timothy Teakettle
2f6d2e838b
Merge pull request #15959 from zeroisthebiggay/fire
...
new mob fire sprites
2023-02-01 00:53:29 +00:00
zerothebigboy
65a0bce02d
yeppers
2023-01-29 23:07:37 -05:00
zerothebigboy
c17c7fd53b
realest
2023-01-29 22:56:35 -05:00
zerothebigboy
8776b8c0cc
epic
2023-01-29 22:35:59 -05:00
zerothebigboy
a7dd149203
shrimple
2023-01-29 22:19:56 -05:00
zerothebigboy
c10b026492
yeah
2023-01-29 22:01:59 -05:00
zerothebigboy
c99b22fe32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre
...
# Conflicts:
# icons/obj/items_and_weapons.dmi
2023-01-29 21:59:01 -05:00
SandPoot
8ae64b1bd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-29 19:16:50 -03:00
silicons
bb7f6d1766
Merge pull request #15944 from LeDrascol/fix-sprite-drink-filling
...
Fix drinking glass sprite issues
2023-01-29 13:45:48 -08:00
zerothebigboy
73d0395cb5
realest
2023-01-29 08:17:01 -05:00
zerothebigboy
e76221f68b
yeppers
2023-01-29 03:57:32 -05:00
zerothebigboy
b8bc94ba13
man
2023-01-29 00:49:55 -05:00
SandPoot
d53c010745
gone
2023-01-28 15:47:18 -03:00
SandPoot
bf31279109
prayer
2023-01-28 01:28:47 -03:00
SandPoot
44913d5fff
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter
2023-01-28 01:20:26 -03:00
SandPoot
c60f36a42b
files
2023-01-28 01:10:49 -03:00
zerothebigboy
4f034eadc1
yep
2023-01-26 05:54:51 -05:00
zerothebigboy
2cfa2c34a6
yep
2023-01-26 04:11:41 -05:00
SandPoot
54192d4d0d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-20 21:35:34 -03:00
Darius
6a4ffcbc29
Fix drinking glass sprite issues
...
- Fixes overlays for the drinking glass and shot glass
- Improves overlays for glassbottle and glassbottlesmall
- Removes duplicate fernetpuro and godlyblend icons
2023-01-19 11:54:49 -05:00
Lin
6dd017fc21
Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat
...
Adds the Polychromatic Cowboy Hat
2023-01-18 18:11:21 -07:00
SandPoot
d362dacfd0
Rebalances the equalizing atmos to be more like bee's ( #287 )
2023-01-18 08:13:27 -03:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
Timothy Teakettle
36ae492e50
Merge pull request #15915 from LeDrascol/update-drink-sprites
...
[PORT] /tg/station Drink Sprites
2023-01-16 23:09:43 +00:00
Timothy Teakettle
35d01aa0f4
Merge pull request #15918 from LeDrascol/port-heirloom-update
...
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00
Darius
a8b7cd9c4a
Adds the Polychromatic Cowboy Hat
...
Adds a new polychromatic variant of the white cowboy hat.
2023-01-10 20:40:01 -05:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
Jerry Wester
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
d527d28ef7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-07 22:58:19 -03:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
Lin
efb2d19cb9
Merge pull request #15921 from LeDrascol/port-furrypride-graffiti
...
[PORT] Furry Pride graffiti
2023-01-07 16:38:34 -07:00
silicons
e292452aae
Merge pull request #15908 from Hatterhat/glasses
...
loadout - glasses and price adjustments
2023-01-07 14:10:35 -08:00
silicons
35497b250f
Merge pull request #15914 from Hatterhat/conveyor-sorter
...
[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
2023-01-07 14:09:55 -08:00
silicons
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
SandPoot
42d4abc164
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-07 16:44:44 -03:00
SandPoot
70b7d35da9
Merge pull request #15899 from LeDrascol/port-alien-tools-resprite
...
[PORT] Abductor surgical tools resprite
2023-01-07 15:50:34 -03:00
Darius
4bea655c8b
Port Furry Pride graffiti
...
Ports the large "Furry Pride" graffiti from TG.
2023-01-05 17:38:02 -05:00
Darius
d90fa375e1
Move heirloom lists to relevant files
...
Port of the current TG heirloom system.
Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.
Also fixes the ancient first aid kit, which is used for a heirloom.
2023-01-04 13:57:54 -05:00
Darius
7dc500e526
Fix Advanced Mop inhands sprite
...
Restores the sprite to it's unique advmop variant, and fixes a sprite order issue.
2023-01-03 13:10:48 -05:00
SandPoot
6a2216e101
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-02 19:05:23 -03:00
Lin
1401959cc9
Merge pull request #15911 from Hatterhat/prescription
...
prescription kits, aka the eyewear accessibility update
2023-01-01 22:52:21 -07:00
