DeltaFire
73d3234882
buncha changes
2020-12-07 22:15:04 +01:00
silicons
8d398b3e24
Merge pull request #13719 from shellspeed1/Adds-construction-bags-from-tg
...
Ports construction bags and makes it easier to get material bags. (READY)
2020-12-03 16:33:47 -07:00
shellspeed1
3735efbfca
Ports construction bags
2020-11-29 18:29:03 -08:00
DeltaFire15
a1d38033a4
Merge pull request #13576 from Sonic121x/patch-2
...
Add a bunch of digitigrade uniform
2020-11-27 22:31:10 +01:00
silicons
c7396632db
Merge pull request #13582 from timothyteakettle/i-hate-mcolor
...
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -07:00
Jay
e1c8d669d5
Exo frame donator
2020-11-07 10:23:14 -06:00
silicons
173a1ef0f1
Merge pull request #13639 from Trilbyspaceclone/shhhh
...
More guns can be suppressed
2020-11-07 00:20:45 -07:00
Timothy Teakettle
46dbb9345d
slime puddles look better and cant be abused by lings ( #13567 )
...
* perfect
* further changes
* no squeaking please
* no more squeaking damnit
* no more squeaking damnit
* slower
* they get broken armor
* broken armor application
* Apply suggestions from code review
* add a comma
* make crossed work properly
* Update squeak.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-11-01 21:40:58 +01:00
Trilby
3307711f08
suppression
2020-10-28 13:00:02 -04:00
silicons
5c53a2cbe2
Merge pull request #13607 from timothyteakettle/polychrome-maid
...
polychromic maid outfit
2020-10-28 07:46:55 -07:00
timothyteakettle
87be4581d7
better
2020-10-27 22:14:35 +00:00
timothyteakettle
cf49e78d45
Merge remote-tracking branch 'upstream/master' into i-hate-mcolor
2020-10-27 22:12:55 +00:00
timothyteakettle
a9f2b86da9
tonne of fixes
2020-10-27 21:32:08 +00:00
Heretical Lizard
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
silicons
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
Timothy Teakettle
0db87ea5f8
better sprite
2020-10-21 22:04:07 +01:00
timothyteakettle
049f153cbf
works but looks weird
2020-10-21 00:55:02 +01:00
Jay
44fa0d5387
donator vest and shirt
2020-10-19 12:30:35 -05:00
Zandario
fcd8fec815
Fixes an oversight and updates some defines ( #13558 )
2020-10-17 12:37:58 +02:00
timothyteakettle
4f5465c39e
fixes
2020-10-17 01:00:04 +01:00
Ghommie
c0f3317c01
mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port.
2020-10-16 20:27:09 +02:00
Sonic121x
72640e5694
Add files via upload
2020-10-16 03:58:41 +08:00
silicons
ff46bfda10
Merge pull request #13547 from zeroisthebiggay/crepe
...
security fashion power crêpe but it's a sheath for your anime sword
2020-10-11 17:33:29 -07:00
silicons
a5ace5ed3a
Merge pull request #13543 from zeroisthebiggay/tyrna
...
ports tg legion reworks, colossus now enrages against sand golems, and some minor sprite stuff with him too
2020-10-11 17:33:16 -07:00
zerothebigboy
dd75b0e5c0
final sprite touch ups
2020-10-11 16:26:40 -04:00
Tupinambis
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
Putnam3145
cbb6020d49
Merge pull request #13553 from timothyteakettle/eye-sprites
...
fixes eye sprites up
2020-10-11 11:56:08 -07:00
Timothy Teakettle
89f2c53d88
ignore those reverts
2020-10-11 18:23:56 +01:00
Timothy Teakettle
5e616f6297
Revert "Revert "finishing touches""
...
This reverts commit b650fa1761
2020-10-11 17:11:27 +01:00
Timothy Teakettle
5aff38597f
Revert "Revert "Revert "Revert "customizable eyes""""
...
This reverts commit d852aacb78
2020-10-11 17:11:01 +01:00
Timothy Teakettle
d852aacb78
Revert "Revert "Revert "customizable eyes"""
...
This reverts commit dedfdf224d
2020-10-11 16:55:07 +01:00
Timothy Teakettle
dedfdf224d
Revert "Revert "customizable eyes""
...
This reverts commit 9f3d745d80
2020-10-11 16:54:53 +01:00
Timothy Teakettle
b76b97fbe9
Revert "Revert "eyes""
...
This reverts commit 4526fef297
2020-10-11 16:54:50 +01:00
Timothy Teakettle
4526fef297
Revert "eyes"
...
This reverts commit 0c99b53c05
2020-10-11 16:54:12 +01:00
Timothy Teakettle
9f3d745d80
Revert "customizable eyes"
...
This reverts commit dc70d17a1e
2020-10-11 16:54:09 +01:00
Timothy Teakettle
b650fa1761
Revert "finishing touches"
...
This reverts commit 05aef528d7
2020-10-11 16:54:01 +01:00
zerothebigboy
c77a1ada93
cringe
2020-10-11 03:18:29 -04:00
zerothebigboy
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
silicons
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
silicons
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
silicons
792080ca3f
Merge pull request #13533 from shellspeed1/jambalya-
...
Face hugger jambalaya. Should be ready.
2020-10-10 22:02:46 -07:00
silicons
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
zerothebigboy
9d281a70ae
oops
2020-10-10 21:45:44 -04:00
zerothebigboy
ef073167df
crepe
2020-10-10 21:39:45 -04:00
zerothebigboy
285b26d35e
sex
2020-10-10 15:08:22 -04:00
silicons
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
silicons
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
Timothy Teakettle
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
The0bserver
98f398338a
belt fix and icons
2020-10-09 02:34:42 -04:00
The0bserver
c9857996f4
sprites
2020-10-09 01:38:46 -04:00
