Putnam3145
6b2d3b116d
Merge branch 'master' into Ghommie-cit430
2019-12-05 20:53:14 -08:00
kevinz000
e2f9a68c2c
Merge pull request #10049 from Useroth/new-tg-plants
...
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
Ghommie
9ca7bb759c
Ports "Slightly improves visible and audible messages."
2019-12-06 02:02:12 +01:00
BlackMajor
b7d0cc6516
Merge pull request #9884 from Useroth/blackpowder-alternative
...
Black powder fix. Alternative to #9861
2019-12-06 11:32:17 +13:00
Useroth
f4bffdc56d
To make sure it doesn't runtime
2019-12-05 19:05:57 +01:00
Useroth
2e84c30e59
Tiny touch-ups
2019-12-05 16:29:50 +01:00
Useroth
950b884da5
Adds colored fairygrass.
2019-12-05 01:47:42 +01:00
Putnam3145
a196e3f45b
Merge pull request #9977 from Useroth/new-tg-plants
...
[FIX] Another patch for the recently added tg plants.
2019-11-30 22:23:41 -08:00
Useroth
85a6d588a8
[fix] Extradimensional oranges now actually grow properly and give proper seeds.
2019-11-28 09:26:52 +01:00
Linzolle
829cc3d81c
Revert "Merge pull request #9613 from Linzolle/hat-toss"
...
This reverts commit d67b7f620ddabfba8a0d
2019-11-27 20:23:33 -06:00
kevinz000
6b53845f06
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
...
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2019-11-26 16:01:48 -07:00
Putnam3145
8219d298a5
Merge pull request #9942 from Useroth/new-tg-plants
...
[Hotfix] Fixed the reagents in the new plants.
2019-11-25 04:39:20 -08:00
Useroth
99300229a1
Fixed the reagents in the new plants.
2019-11-25 13:35:26 +01:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Useroth
6a59cc1c99
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
Fermi
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
Fermi
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
Fermi
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e
Revert "pls2"
...
This reverts commit 0eb635b908
2019-11-24 03:02:04 +00:00
Fermi
cb4bfa65d1
Revert "?"
...
This reverts commit 05d18171e0
2019-11-24 03:01:55 +00:00
Fermi
1f7e9d8ab5
Revert "please"
...
This reverts commit ac53c26d87
2019-11-24 03:01:51 +00:00
Fermi
ac53c26d87
please
2019-11-24 02:58:15 +00:00
Fermi
05d18171e0
?
2019-11-24 02:57:46 +00:00
Fermi
0eb635b908
pls2
...
ugh
2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
Fermi
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
Fermi
00601a0c87
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3
PLASE
2019-11-24 02:41:21 +00:00
Fermi
b404e18b15
Merge branch 'master' into FERMICHEMCurTweaks
2019-11-23 00:10:33 +00:00
Useroth
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
Useroth
b91d0e27da
An alternative solution to the problems with blackpowder.
2019-11-20 15:49:04 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
kevinz000
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
kevinz000
4c89b8c33f
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -07:00
TrilbySpaceClone
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
Ghommie
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
kevinz000
7b6604108f
Merge pull request #9713 from Trilbyspaceclone/sprite-issues
...
Makes catnip have sprites
2019-11-10 11:28:49 -07:00
Ghommie
b2b1390bd3
Ports techweb backend refactor & co.
2019-11-07 05:07:38 +01:00
Ghommie
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
TrilbySpaceClone
ae8b43e1c0
Update tea_coffee.dm
2019-11-04 06:05:10 -05:00
TrilbySpaceClone
82b148b7b7
Merge branch 'master' into Cargo_MKII
2019-11-03 17:53:06 -05:00
TrilbySpaceClone
a8248c68f4
perhaps
2019-11-03 12:53:02 -05:00
kevinz000
0064529362
Merge pull request #9610 from Ghommie/Ghommie-cit273
...
ports anti-magic component code updates (holymelon sold separately).
2019-10-29 21:26:03 -07:00
kevinz000
bc3dd51db3
Merge pull request #9626 from Ghommie/Ghommie-cit278
...
Unmodularize space kiwis and banana spiders.
2019-10-29 21:21:14 -07:00
Ghommie
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
Ghommie
c0130467db
Unmodularize space kiwis and banana spiders.
2019-10-26 18:15:02 +02:00
MMMiracles
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
Ghommie
ad7101d0aa
ports anti-magic component code updates (holymelon not included).
2019-10-25 03:20:42 +02:00
Ghommie
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
