Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
Ghommie
|
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 |
|
Ghommie
|
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 |
|
Artur
|
c402c6dc30
|
Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/
|
2020-04-06 13:24:52 +03:00 |
|
Artur
|
7da4ad5694
|
Damned title doesnt want to show up
|
2020-04-03 10:29:07 +03:00 |
|
Ghommie
|
2bf6d888bd
|
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-03-30 18:31:26 +02:00 |
|
Ghommie
|
c3faf94d8f
|
WIP
|
2020-03-30 05:29:39 +02:00 |
|
zeroisthebiggay
|
f5a96241ab
|
sneaksuits are not fireproof (#11573)
* and i wanna die
* i decide to revert
* a a a a
|
2020-03-23 15:47:41 +01:00 |
|
ZeroMan
|
35a4d71a54
|
im sorry little one
|
2020-03-19 21:59:14 -04:00 |
|
Putnam3145
|
480eb32c68
|
Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
|
2020-03-11 17:01:13 -07:00 |
|
Ghommie
|
27a7f754c4
|
Fix runtimes some more.
|
2020-03-10 22:40:06 +01:00 |
|
Ghommie
|
2b4b626fac
|
support for items that switch states through update_icon.
|
2020-03-10 16:55:30 +01:00 |
|
Ghommie
|
ad4d290ea7
|
WIP
|
2020-03-08 19:26:01 +01:00 |
|
Ghommie
|
f2c8a7cd6f
|
Porting a couple material datums code updates and fixes.
|
2020-03-04 15:59:46 +01:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Ghommie
|
5875f2578c
|
demodularize and removes lot of unused clothing with missing sprites.
|
2020-01-28 02:32:46 +01:00 |
|
kappa-sama
|
3e199ed780
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
|
2020-01-12 14:23:38 -05:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
kappa-sama
|
3281db6000
|
scream
|
2020-01-10 22:39:13 -05:00 |
|
kappa-sama
|
5857da02a5
|
cheeki breeki
|
2020-01-10 22:35:30 -05:00 |
|
kappa-sama
|
93fc0b3716
|
xenos helmet
|
2020-01-10 22:34:26 -05:00 |
|
kevinz000
|
8f60099595
|
Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
|
2020-01-10 14:01:06 -08:00 |
|
Lin
|
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 |
|
Unknown
|
afc0ca44f2
|
Merge branch 'master' into xantholne-cowboy02
|
2020-01-08 20:35:36 -07:00 |
|
Unknown
|
4773a3e374
|
Fuggin Cowboy Clothes
|
2020-01-08 07:15:42 -07:00 |
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
Ghommie
|
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 |
|
Linzolle
|
70e50e57cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-17 20:21:49 -06:00 |
|
Unknown
|
73abc2ae40
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-14 17:15:00 -07:00 |
|
Ghommie
|
3fcb7808fd
|
args
|
2019-12-13 02:30:17 +01:00 |
|
Ghommie
|
8ec4bdaef5
|
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2019-12-13 02:30:11 +01:00 |
|
Trilbyspaceclone
|
a7c8fb6470
|
corrects/adds a new dog fashion to telegram hat
|
2019-12-11 12:43:07 -05:00 |
|
Ghommie
|
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 |
|
Linzolle
|
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 |
|
Unknown
|
97e686cf23
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-06 17:21:08 -07:00 |
|
TrilbySpaceClone
|
e1717bb534
|
Merge branch 'master' into crow
|
2019-12-03 23:45:05 -05:00 |
|
Putnam3145
|
4f018b070f
|
Merge pull request #9996 from Ghommie/Ghommie-cit413
Fixes tinfoil hats giving random traumas.
|
2019-11-29 06:16:36 -08:00 |
|
Unknown
|
233ca30cd6
|
Merge branch 'master' into xantholne-christmas01
|
2019-11-28 23:21:36 -07:00 |
|
kevinz000
|
f287af694b
|
Merge pull request #9969 from Linzolle/hat-man-bad
revert knocking people's hats off
|
2019-11-28 23:04:34 -07:00 |
|
Ghommie
|
7990d1328b
|
Fixes tinfoil hats giving random traumas.
|
2019-11-29 06:48:52 +01:00 |
|
Ghommie
|
3b8aebbbc2
|
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-11-29 00:40:16 +01:00 |
|
Unknown
|
33854e8fd8
|
Adds a huge amount of Christmas clothes
|
2019-11-27 20:07:39 -07:00 |
|
Linzolle
|
829cc3d81c
|
Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
|
2019-11-27 20:23:33 -06:00 |
|
Ghommie
|
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 |
|
Unknown
|
4e20f576e6
|
Merge branch 'master' into xantholne-berets02
|
2019-11-25 20:16:15 -07:00 |
|
Unknown
|
495b4b6ddc
|
Fixes some issues
|
2019-11-25 20:13:07 -07:00 |
|
Linzolle
|
cc54e5230f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-11-25 21:01:25 -06:00 |
|
Ghommie
|
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 |
|
TrilbySpaceClone
|
2136968585
|
Ring ring
|
2019-11-21 21:55:17 -05:00 |
|
Unknown
|
4974400ccb
|
Merge branch 'master' into xantholne-berets01
|
2019-11-21 11:01:42 -07:00 |
|