 silicons
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07:00 |
|
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
|
Ghommie
|
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 |
|
|
Anonymous
|
9e7b884e86
|
Adds remaining TOSOrvikepi
|
2020-06-21 13:25:23 +03:00 |
|
|
Anonymous
|
45dab7fa66
|
Kepi and Orvilike Kepi
|
2020-06-20 22:52:33 +03:00 |
|
|
Timothy Teakettle
|
3811fcbcf1
|
some fixes
|
2020-06-15 21:30:14 +01:00 |
|
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
|
Ghom
|
8cb15f9279
|
Actually Balanced and Standardized Vendor Prices. (#12495)
|
2020-06-09 22:22:53 -07:00 |
|
|
Lin
|
5e37d3ef3b
|
Merge pull request #12430 from Ghommie/Ghommie-cit811
Fixing various icons problems with some clothings.
|
2020-06-03 20:23:16 +00:00 |
|
|
Ghom
|
d53dca7322
|
Fixing just a couple issues. (#12417)
|
2020-06-02 15:30:22 -07:00 |
|
|
Ghommie
|
1a9484cf2e
|
Fixing missing clothing icons etc.
|
2020-06-02 17:43:31 +02:00 |
|
|
Ghommie
|
e51ac4e745
|
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-05-29 17:58:35 +02:00 |
|
|
Ghom
|
ab5d65a454
|
Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
|
2020-05-24 13:05:15 -07:00 |
|
|
Ghommie
|
7fb96ab0cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-05-12 20:06:59 +02:00 |
|
|
Ghommie
|
e8a0ea5acc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit731
|
2020-05-11 00:34:22 +02:00 |
|
|
Suicidalpickles
|
2d9aac8f31
|
cakehat cat wearing a cakehat while patting a cak (#12166)
fix
|
2020-05-09 00:40:07 +02:00 |
|
|
Ghommie
|
90bf157f5e
|
Fixing some runtimes and issues.
|
2020-05-08 17:17:33 +02:00 |
|
|
Ghommie
|
b383066e57
|
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
|
2020-05-02 00:00:49 +02:00 |
|
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
|
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 |
|