shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,351 Commits 5 Branches 0 Tags
a650e1e411a8b42e522aac6dac0cb142a08098d9
Commit Graph

250 Commits

Author SHA1 Message Date
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01: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
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
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
Trilbyspaceclone
fc6633071a rwar! 2019-08-18 01:07:38 -04:00
TrilbySpaceClone
4dae36869c tada 2019-08-18 01:01:00 -04:00
Trilbyspaceclone
43b1d0405e Update flowers.dm 2019-08-17 23:25:38 -04:00
Trilbyspaceclone
bb9aa4f039 I woulder how much this will fuck everthing up 2019-08-17 22:49:06 -04:00
Trilbyspaceclone
cfd8217947 Update flowers.dm 2019-08-17 22:10:23 -04:00
Raptorizer
ff58fec243 New plant type: Peaches 
Botanists can now grow peaches from a new pack of seeds!
 2019-08-17 02:50:56 -05:00
lolman360
e838da8039 Merge pull request #3 from Citadel-Station-13/master 
3
 2019-08-17 11:55:56 +10:00
kevinz000
c2dd7111d0 Merge pull request #9112 from Trilbyspaceclone/patch-209 
Heyyyy lets make sure the strawberry seeds are in the vender and spelled correctly
 2019-08-16 17:17:04 -07:00
kevinz000
f9eb85c3c1 Merge pull request #9130 from Owai-Seek/ServiceStuff 
Service QoL
 2019-08-16 17:03:11 -07:00
Winter Flare
04c302b08e Service Tweaks 
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.

Allows the plant DNA maniuplator to be wrenched and moved.
 2019-08-15 06:28:46 -04:00
Trilbyspaceclone
d30df526f7 Update berries.dm 2019-08-11 19:05:36 -04:00
TrilbySpaceClone
821463f59c Nya 2019-08-11 11:47:56 -04:00
lolman360
da61b66f5c ban me? 2019-08-11 11:11:30 +10:00
Cebutris
d77360c794 gives tea aspera proper reagents 2019-08-10 19:32:12 -04:00
TrilbySpaceClone
ab13b62bdd fruits of labor 2019-08-08 16:14:04 -04:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Ghommie
3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
Ghommie
1323ace579 Peanuts, peanut butter, and sandwiches. 2019-06-17 05:17:24 +02:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
deathride58
7dd5e563b0 Clamps biogen amount to a sane amount 2019-05-02 00:21:38 -04:00
deathride58
8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
Ghommie
0ba384be86 1 2019-01-09 21:18:25 +01:00
kevinz000
302f8f00f4 Update tomato.dm 2019-01-04 00:42:29 -08:00