813e0f4c79
Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items
2021-01-01 22:30:04 +00:00
1b9a399bbd
Merge pull request #13905 from zeroisthebiggay/help
...
gives codex cicatrix inhands
2020-12-30 14:46:26 -07:00
da25c48b2c
Merge pull request #13855 from Chiirno/paramedBoxOffice
...
Paramed office on box + Surgery remodel
2020-12-29 01:27:49 -07:00
6f38ec403f
help
2020-12-28 15:34:35 -05:00
1b450f7f14
Update bedsheets.dmi
2020-12-26 01:55:11 +00:00
41115bacb5
Update bedsheets.dmi
2020-12-26 01:48:06 +00:00
35896e92ec
Paramedic office added and operating room remodeled
2020-12-22 21:50:22 -04:00
901fcddf44
Merge pull request #13819 from Hatterhat/surv-dag-buf
...
survival dagger light fix + butchery buff
2020-12-21 10:30:13 -07:00
3ad777f8f7
Merge pull request #13755 from silicons/colormates
...
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
b8b2f34735
funny knife
2020-12-19 18:45:25 -06:00
4382fd7073
Merge pull request #13767 from MrJWhit/new-meat-sprites
...
Pretty meat icons update
2020-12-13 23:09:26 -07:00
3bd1965c7d
Merge pull request #13769 from MrJWhit/goose-bar-sign
...
Adds goose bar sign
2020-12-14 06:06:03 +01:00
113366754f
Merge pull request #13765 from MrJWhit/new-jukebox-sprites
...
Fancier jukebox sprites
2020-12-14 05:24:47 +01:00
f5b99b83f8
Fully functional
2020-12-13 02:29:29 -05:00
939d6b7ad8
goose barsign
2020-12-13 00:57:05 -05:00
4c1013e455
Update food.dmi
2020-12-12 23:53:55 -05:00
7ae10f2b26
Update stationobjs.dmi
2020-12-12 23:21:05 -05:00
4b20d26d2b
Merge remote-tracking branch 'citadel/master' into colormates
2020-12-12 01:56:37 -07:00
c2727ca278
Merge pull request #13743 from Linzolle/thunderdome
...
thunderdome entertainment monitors fix + stuff
2020-12-12 01:55:53 -07:00
317f33b4e5
fixes
2020-12-11 05:14:23 -07:00
477330197c
Huh we already had this
2020-12-10 01:14:43 -05:00
3e951d334c
fix entertainment monitors
2020-12-08 17:21:14 -06:00
3735efbfca
Ports construction bags
2020-11-29 18:29:03 -08:00
e1c8d669d5
Exo frame donator
2020-11-07 10:23:14 -06:00
3307711f08
suppression
2020-10-28 13:00:02 -04:00
5c53a2cbe2
Merge pull request #13607 from timothyteakettle/polychrome-maid
...
polychromic maid outfit
2020-10-28 07:46:55 -07:00
576c74dc5f
Resprites the brass claw to make it more like a cwc weapon ( #13586 )
...
No more cheetos blade. Also sorts its file to be next to the spear, purely because that annoyed me that it wasn't next to the other weapon,
Co-authored-by: Dan-Neposh <keatesequoy@gmail.com >
2020-10-25 14:10:48 +01:00
231c5f0a9d
Merge pull request #13581 from Ghommie/Ghommie-cit840
...
mime/clown masks' face concealment toggleable with altclick. Plasmaman helmet welding visor & smiley port.
2020-10-21 15:43:09 -07:00
049f153cbf
works but looks weird
2020-10-21 00:55:02 +01:00
44fa0d5387
donator vest and shirt
2020-10-19 12:30:35 -05:00
c0f3317c01
mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port.
2020-10-16 20:27:09 +02:00
dd75b0e5c0
final sprite touch ups
2020-10-11 16:26:40 -04:00
c77a1ada93
cringe
2020-10-11 03:18:29 -04:00
a8315a69e2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe
...
# Conflicts:
# icons/mob/clothing/belt.dmi
# icons/obj/clothing/belts.dmi
2020-10-11 01:19:18 -04:00
d2ce6ca709
Merge pull request #13540 from TheObserver-sys/QoLPass
...
Service+Plumbing QoL Pass 1: Beakers, Belts, Plungers and Pipes
2020-10-10 22:04:49 -07:00
c3983ee55b
Merge pull request #13535 from Hatterhat/energy-sabres
...
[READY] Energy Sabers - an elegant esword skin for a more civilized age
2020-10-10 22:04:17 -07:00
792080ca3f
Merge pull request #13533 from shellspeed1/jambalya-
...
Face hugger jambalaya. Should be ready.
2020-10-10 22:02:46 -07:00
8b48cab574
Merge pull request #13233 from Hatterhat/za-hando
...
[READY] za hando - a pr about ling claws and punching shit
2020-10-10 21:59:05 -07:00
ef073167df
crepe
2020-10-10 21:39:45 -04:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
385bd57940
reworks family heirlooms, adds heirlooms that can be based off your species ( #13444 )
...
* corgi tracker
* better heirloom system
* typo
2020-10-10 12:15:39 +02:00
c9857996f4
sprites
2020-10-09 01:38:46 -04:00
96e55d6233
the last bit
2020-10-07 17:50:21 -05:00
9928a172d0
initial commit - sabres
2020-10-06 21:58:59 -05:00
efc4e089c9
Merge pull request #13503 from Hatterhat/glaive-knuckledagger
...
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
2020-10-06 17:03:44 -07:00
8eac1cb939
Merge pull request #13511 from Hatterhat/hakitavolver
...
additional revolver sprites
2020-10-06 16:51:18 -07:00
2ffcdb4862
Soups on
2020-10-06 16:07:29 -07:00
c063004d60
blued, but dark
2020-10-06 14:50:58 -05:00
5a517be5e7
thanks toriate
2020-10-06 12:47:00 -05:00
dbdec5bbae
man i am really indecisive
2020-10-06 11:39:19 -05:00
Timothy Teakettle