dbb6218e0d
merp
2020-01-30 14:54:07 +08:00
afb4bebf2d
merge conflicts
2020-01-30 12:47:48 +08:00
beb90d39a6
polychromic winter coat
2020-01-30 12:44:40 +08:00
cde6601c60
Merge pull request #10759 from Ghommie/Ghommie-cit534
...
demodularize and removes lot of unused clothing with missing sprites.
2020-01-29 19:58:26 +00:00
1a40bec44b
merge maybe fix
2020-01-29 18:45:21 +08:00
e6f8f478d7
prototype
2020-01-29 18:43:15 +08:00
5875f2578c
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01:00
4db9eadaf1
drake armor deserves to be good
2020-01-24 18:16:40 -06:00
d46f3232f9
tada
2020-01-14 10:57:32 +08:00
bd2fe8eb01
durathread winter coat from hyper
2020-01-13 13:12:17 +08:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
c4cb06f8f0
Merge pull request #10112 from Ghommie/Ghommie-cit447
...
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
186194418e
tg 43454+43688 port, tweaks w/ trilby, db crate
2020-01-04 01:33:32 -06:00
80e716eeaf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
2019-12-30 18:14:47 +01:00
382c5d057a
updates ratvar coat
2019-12-23 12:02:05 +08:00
b75349bebf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
2019-12-23 04:32:09 +01:00
18481ec253
more coat stuff yes yes
2019-12-22 12:19:58 +08:00
138b460af3
Merge pull request #10079 from Ghommie/Ghommie-cit438
...
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
2019-12-19 23:26:53 +00:00
73abc2ae40
Merge branch 'master' into xantholne-christmas01
2019-12-14 17:15:00 -07:00
8ec4bdaef5
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2019-12-13 02:30:11 +01:00
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
019ab63e09
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
2019-12-07 02:06:51 +01:00
97e686cf23
Merge branch 'master' into xantholne-christmas01
2019-12-06 17:21:08 -07:00
2ce79828b8
ratvar coat updated
2019-12-05 20:46:59 +08:00
72e5e17c51
ratvarian and narsian winter coats
2019-12-03 18:16:36 +08:00
b5f732c838
formal and cc winter coats + start of cult coats
2019-12-01 04:06:03 +08:00
233ca30cd6
Merge branch 'master' into xantholne-christmas01
2019-11-28 23:21:36 -07:00
f287af694b
Merge pull request #9969 from Linzolle/hat-man-bad
...
revert knocking people's hats off
2019-11-28 23:04:34 -07:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
33854e8fd8
Adds a huge amount of Christmas clothes
2019-11-27 20:07:39 -07:00
829cc3d81c
Revert "Merge pull request #9613 from Linzolle/hat-toss"
...
This reverts commit d67b7f620ddabfba8a0d
2019-11-27 20:23:33 -06:00
a5298dac7e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-27 21:44:56 +01:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
66a97cb224
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-22 05:17:42 +01:00
60def2a9fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-21 13:08:23 +08:00
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
468b6eb609
mining winter coat shtuff
...
- adds the mining winter coat to mining wardrobes and mining lockers
2019-11-17 22:27:09 +08:00
1bb8ff1c0c
Fixes loadout name, adds DAB outfit crate to cargo
...
For "recruitment" on-station.
2019-11-17 15:08:30 +03:00
dea5019bc9
cosmic winter coat yeeeehaw
2019-11-17 20:06:01 +08:00
7d99508bd0
adds janitor winter coat
2019-11-17 15:45:12 +08:00
b7f4580414
robotics winter coat
2019-11-17 11:50:56 +08:00
8db64df364
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-16 16:54:27 +08:00
e0e3c510d4
adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats
2019-11-16 15:31:20 +08:00
20bafdd855
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-03 03:23:59 +01:00
ad00e6b36a
Merge branch 'master' into assu
2019-10-28 19:02:48 +03:00
329f86cea0
Merge pull request #9612 from Linzolle/blood-overlay-again
...
fix blood overlays again
2019-10-27 17:21:55 -07:00
203509b405
Poll said its DAB
2019-10-27 16:27:03 +03:00
8fb0a68feb
Adds Hat Throwing ( #45355 )
...
* adds hat throwing on people and borgs
* clothing flags, hats can knock off non-items, borg hat blacklist check
* prevents hats with items in them from being able to land on heads
* removes extra equip, hats can go on the hatless again, tinfoil fix
* if
* bit flag
2019-10-25 16:19:19 -05:00
9e89e898ee
not again
2019-10-25 15:58:10 -05:00
dcb4c6ae04
Merge branch 'master' into assu
...
...and its still coming together...
2019-10-25 10:31:07 +03:00
Seris02