d1eda326c8
Merged the old gs code with the new Hyper code
2021-10-16 18:45:58 +02:00
21442b6094
Merge pull request #8 from Moltovz/letsseeifthisworks
...
removes vladin plushie
2021-08-25 19:58:17 -03:00
5709c17c9b
removes vladin plushie
2021-08-23 13:35:16 -04:00
ad78cbbeea
Added borb seed
2021-08-07 00:17:20 -07:00
edf2aa8d90
New drink
2021-07-28 03:56:48 -07:00
814ed0e328
Merge pull request #1336 from RachelDoe/master
...
Prevent Portallights from being deepfried?
2021-06-28 09:05:14 +01:00
49a15b027a
Prevent Portallights from being deepfried?
...
Tested and confirmed working. This edit will prevent portallights from being deepfried.
I will leave the decision to either merge or reject this PR to the admin looking into this. This literally took me like five minutes so don't feel bad if you need to kick this if its not aligning to the vision of the server.
2021-06-28 03:50:50 +02:00
6dd3456556
Fixes synthsteak
2021-06-27 17:07:46 -03:00
6986dbc4dc
Fixes several things
2021-06-11 18:14:57 -03:00
fe40689164
Microwave Easter Egg
2021-06-07 19:03:38 -03:00
a5cf94ab29
Merge pull request #10212 from Ghommie/Ghommie-cit471
...
Ports some hud and update_icon code updates.
2021-06-04 15:23:40 -03:00
2f4acc589f
Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
...
[READY]TGUI Next Crafting
2021-06-03 17:02:11 -03:00
09a51e20be
Merge pull request #1089 from DragonTrance/xenobio-console
...
i swear to god
2021-04-26 04:35:24 +01:00
91f8a8eb8a
i swear to god
2021-04-25 11:17:04 -07:00
0f0ca5c2c7
Merge pull request #1087 from WTFIsmyname/Old-gibbers-were-better
...
Makes Gibbers Useful.dm
2021-04-22 14:48:08 +01:00
721ff6c484
Update gibber.dm
2021-04-22 18:03:31 +10:00
2de635f4dd
can now click stuff while in slime consoles
2021-04-21 23:48:15 -07:00
9c61a94d9e
jani sprites, drink sprites, and no super large monkey energry
2021-04-20 21:38:06 +01:00
447c784c0a
Totally Original Reference
2021-04-17 04:25:51 -03:00
58b12a8147
Item sounds
2021-03-28 22:05:25 +01:00
a336b3086f
trays hold more + donk pockets store correctly
2021-03-02 00:43:08 -07:00
7e4585297f
funny cum-looking drink
2021-02-24 19:26:59 -07:00
711e52cc09
compile errors fixed.
2021-02-21 23:54:50 +00:00
3ebb7488de
Merge branch 'master' into plant-adding
2021-02-21 12:06:48 -07:00
a31f73a9fb
fuck you
...
fuck you x2
2021-02-12 22:35:21 -05:00
58b69503e3
#4
2021-02-11 20:02:40 -07:00
187471f0af
#1
2021-02-08 19:15:44 -07:00
9e7a353816
that thang bleedin
...
wocky sluuuuuuuuush
2021-02-07 01:41:27 -05:00
a40e002595
loose ends.
...
more prices I missed
2021-02-04 14:20:17 +00:00
c0de8ec3ac
some prices and lights I forgot.
2021-02-04 13:10:16 +00:00
5584bb9522
Economy part 2 - Vendors
2021-02-04 12:42:50 +00:00
f53ca6ba4b
Life is just a bowl of pits.
...
A reponse to all who say life is a bowl of cherries, having some good (the flesh of the fruit) and some bad (the pits)
2021-01-28 21:25:55 -05:00
d00fb91d3d
soup and salad from your local panera
...
The waste of many good materials, the vexation that frequently attends such mismanagements, and the curses not unfrequently bestowed on cooks with the usual reflection, that whereas God sends good meat, the Devil sends cooks.
2021-01-28 17:38:25 -05:00
cd8ef5be4b
fixes bread & banana spider loot
2021-01-20 14:05:20 -03:00
e1ad9f8957
i have done nothing but teleport bread for three days
2021-01-19 13:48:33 -03:00
5cca6129a5
Regal Rats + Mice in hat
2021-01-15 21:18:12 -03:00
78da9a5a12
Merge branch, update to current
2021-01-08 07:26:35 -03:00
6ef6d21a84
Merge pull request #9722 from Ghommie/Ghommie-cit320
...
Umodularize saycode and meat slabs.
2021-01-05 17:23:36 -03:00
78427df75f
Food icons, and some custom ones
...
Food icons, (mainly ports from Eris, they do amazing work over there with their sprite work), and some custom ones I made myself with similar colour pallets. Also makes synth meat less attractive.
2021-01-05 13:20:54 +00:00
9e37d3be62
Fix merge conflicts
2021-01-05 03:41:08 -03:00
b0779fe2d7
Merge pull request #9983 from Ghommie/Ghommie-cit408
...
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
291dcf9515
Merge pull request #10575 from Arturlang/TGUIs_Nexties
...
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
ea58ef76b1
painkiller and pina colada fix
2021-01-04 04:01:14 -03:00
12c8ebea11
Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2021-01-03 05:21:47 -03:00
ee082f200e
Fermi1
2021-01-03 05:00:57 -03:00
222d37751e
Fixes blood and properly adds the char reagent to grilled items as well (you can overdose on it)
2021-01-03 01:58:45 -03:00
a9575ffc21
Merge pull request #794 from lyricalpaws/master
...
Let synthliz and IPC have and be infected by nanites
2021-01-02 14:02:24 +00:00
cab493231b
Reagent fix pack 3
2021-01-01 02:21:45 -03:00
c2a937bb73
Changing Nanotrasen to Kinaris where needed
2020-12-31 17:58:25 +00:00
38fcb1fa56
Balance gamer food
2020-12-29 16:23:03 -03:00
KabKebab