shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,186 Commits 5 Branches 0 Tags
994c01c8ec03ee23ca410f31474b11bedc7d1c19
Commit Graph

278 Commits

Author SHA1 Message Date
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
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
kevinz000
1ff69c23fd Merge pull request #9351 from YakumoChen/holeymelon 
Removes antimagic from holymelon
 2019-10-17 13:07:40 -07:00
Thalpy
5f5c719326 Merge branch 'master' into FERMICHEMCurTweaks 2019-10-05 23:40:26 +01:00
Thalpy
cf8db59649 Merge branch 'master' into FERMICHEMCurTweaks 2019-10-01 08:20:16 +01:00
TrilbySpaceClone
3f893195bf tested! 2019-09-30 11:42:07 -04:00
TrilbySpaceClone
41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
YakumoChen
b8c3dfc6f0 made it commented out instead of deleted 2019-09-24 03:26:24 +00:00
YakumoChen
e350e50aa3 slightly less holy melons 2019-09-24 03:11:50 +00:00
Thalpy
641196b9dd Merge branch 'master' into FERMICHEMCurTweaks 2019-09-19 19:57:57 +01:00
Fermi
f1f762ef48 Darnit bobby 2019-09-04 21:45:55 +01:00
Fermi
91cace6812 Merge remote-tracking branch 'upstream/master' into FERMICHEMCurTweaks 2019-09-03 20:33:33 +01:00
Fermi
7890ad08d5 what is this 2019-09-03 20:30:21 +01:00
TrilbySpaceClone
fd585aa6ea Merge branch 'master' into more_cooking2 2019-09-03 11:22:38 -04:00
Trilbyspaceclone
473cde6a9d huh 2019-08-31 21:16:14 -04:00
TrilbySpaceClone
ea7235d089 Merge branch 'master' into fruit 2019-08-29 21:15:18 -04:00
nik707
2307f7a2a6 Merge pull request #9146 from Raptorizer/Botany-Peaches 
New plant type: Peaches
 2019-08-29 19:59:37 -05:00
TrilbySpaceClone
d3852ebd56 even more 2019-08-29 19:39:10 -04:00
Winter Flare
26c5aa6185 Update berries.dm 
Actually fixes strawberries so they have visible growth stages and death icons.
 2019-08-27 03:47:56 -04:00
TrilbySpaceClone
6c6391b4c4 Merge branch 'master' into fruit 2019-08-19 07:37:12 -04:00
lolman360
323073f8d4 Merge pull request #6 from Trilbyspaceclone/patch-213 
Patch 213
 2019-08-19 11:12:50 +10:00
Trilbyspaceclone
8214a7012f I Didnt save the two corrections 2019-08-18 01:17:34 -04:00