0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
5c88253f93
lots more hats
2020-07-21 22:58:13 +01:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
ae053a9a08
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
2020-06-23 03:12:49 +02:00
1a9484cf2e
Fixing missing clothing icons etc.
2020-06-02 17:43:31 +02:00
e51ac4e745
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-05-29 17:58:35 +02:00
2d9aac8f31
cakehat cat wearing a cakehat while patting a cak ( #12166 )
...
fix
2020-05-09 00:40:07 +02:00
42ff9b1d35
Final test, fixes and parent calls.
2020-04-14 01:23:26 +02:00
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02:00
c402c6dc30
Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/
2020-04-06 13:24:52 +03:00
7da4ad5694
Damned title doesnt want to show up
2020-04-03 10:29:07 +03:00
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +01:00
ad4d290ea7
WIP
2020-03-08 19:26:01 +01:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
3e199ed780
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
2020-01-12 14:23:38 -05:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
3281db6000
scream
2020-01-10 22:39:13 -05:00
5857da02a5
cheeki breeki
2020-01-10 22:35:30 -05: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
3fcb7808fd
args
2019-12-13 02:30:17 +01: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
1e2a4f606c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-08 14:17:00 -06:00
4f018b070f
Merge pull request #9996 from Ghommie/Ghommie-cit413
...
Fixes tinfoil hats giving random traumas.
2019-11-29 06:16:36 -08: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
7990d1328b
Fixes tinfoil hats giving random traumas.
2019-11-29 06:48:52 +01:00
829cc3d81c
Revert "Merge pull request #9613 from Linzolle/hat-toss"
...
This reverts commit d67b7f620ddabfba8a0d
2019-11-27 20:23:33 -06:00
df051186eb
Merge branch 'master' into abductor-update
2019-11-11 00:08:59 +00:00
449f9f03c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-10 21:20:24 +01:00
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
20bafdd855
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-03 03:23:59 +01:00
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
80cd4902ca
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273
2019-10-28 00:49:22 +01: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
ad7101d0aa
ports anti-magic component code updates (holymelon not included).
2019-10-25 03:20:42 +02:00
507e9b7aa0
kinda a dumb workaround
2019-10-24 13:57:00 -05:00
deaf1a0e00
guess tahts what ghom meant
2019-10-24 12:14:22 -05:00
8f78bfeb26
oops
2019-10-23 21:36:47 -05:00
fb234783a7
muzzle-compatible helmets and masks
2019-04-12 04:00:47 -05:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
0bf1f7ce14
[MIRROR] Refactors some trauma code, fixes some trauma heals not working ( #5955 )
...
* Refactors some trauma code, fixes some trauma heals not working (#36093 )
* Refactors some trauma code, fixes some trauma heals not working
* that too
* fix indent
* antur comments
* Refactors some trauma code, fixes some trauma heals not working
2018-03-15 20:50:10 -05:00
df5cbc448e
Fixes tinfoil hats and lengthens the time for someone else to put it on ( #36019 )
...
* Fixes tinfoil hats and lenghtens the time for someone else to put it on
* Adds some flavor to that text
2018-03-04 16:06:14 -06:00
75b038511c
[MIRROR] Alternative PR to brass apples: Adds bronze sheets ( #5758 )
...
* Alternative PR to brass apples: Adds bronze sheets (#35874 )
* Adds bronze sheets
* nope!
* Alternative PR to brass apples: Adds bronze sheets
2018-03-02 20:07:39 -06:00
5493339c7d
Adds Tinfoil Hats ( #35665 )
...
* adds a tinfoil hat to protect you from government conspiracies and aliens
* qutoes ples
* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe
* conspiracy phobia, nodrop on hat once equipped, also CONTRAST
* a single comma
* cyberboss changes
* |=
* central typo fix
2018-02-25 18:11:48 -06:00
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00
e0703fcecc
Removes Fun
2018-02-01 21:39:30 -06:00
Timothy Teakettle