Commit Graph

4509 Commits

Author SHA1 Message Date
KabKebab
12a865f2e0 Merge branch 'master' of https://github.com/KabKebab/GS13 2022-05-07 21:00:23 +02:00
KabKebab
92060cc123 weight chems are now more potent, weight loss chem is now safer 2022-05-07 20:42:47 +02:00
MrSky12
e9c4c2e009 Merge Pull From dumb guy.
ahelp message fix
2022-05-06 17:24:48 +02:00
SomeGuyEatingPie
136cd845b9 Corrected Funny reference branches 2022-05-06 12:59:08 +01:00
SomeGuyEatingPie
db96001ed0 Merge branch 'KabKebab:master' into master 2022-05-06 12:42:49 +01:00
SomeGuyEatingPie
3923f4b91e Changeed Ahelp message
When submitting an adminhelp without an admin present, the game tells players the message has been sent to the discord.
Now the game tells players to submit their ahelp to the discord channel.
2022-05-06 12:42:24 +01:00
MrSky12
67d29801b8 Kinaris MRE Edit. 2022-05-05 22:34:05 +02:00
KabKebab
57e74e61ff Merge branch 'master' of https://github.com/KabKebab/GS13 2022-05-01 19:19:40 +02:00
KabKebab
cf8c677893 fat chem no longer does liver damage 2022-05-01 19:19:32 +02:00
MrSky12
39abf3ee7f Pamphlet done.
Edited the pamphlet, you guys can check it out.
2022-05-01 18:35:45 +02:00
MrSky12
3935b75ec0 Mf ben edit.
Instead of typing :ugh: in ooc you can just type :ben:
2022-05-01 18:27:08 +02:00
MrSky12
3fc9b7f69b Edit of the soap bar.
Does not contain kinaris.

Added a new company that makes soap and other stuff for GATO.
2022-05-01 18:26:37 +02:00
MrSky12
bf1b5f92f8 Reinforced Plasma Window edit
Edited the sprite for the reinforced windows.
2022-05-01 18:25:47 +02:00
MrSky12
08548f8a5a Updated the GATO Banner
Now with a better look and now it does not look like a kinaris flag when picked up (BOTH HANDS)
2022-05-01 18:25:21 +02:00
MrSky12
288ae9a2cd Updated chat animation.
. . .
2022-05-01 18:24:26 +02:00
KabKebab
081d4c1c89 Replaced the text in the "welcome to gato" book, changed its object name too + Fi plushie! 2022-05-01 16:56:06 +02:00
KabKebab
1c81499ac4 Merge pull request #11 from SimplySable/master
No more Hyperstation plushies! (WHO ARE YOU PEOPLE!??)
2022-04-27 12:29:37 +02:00
Sable
2cc5f5582b Merge branch 'KabKebab:master' into master 2022-04-27 00:56:25 -07:00
simplysable
3e69dda44a Removed Hyperstaion Plushies
This Change removes all the hyperstation plushie spawns and their mentions in the code. (They are commented out but I recommend disabling __donator.dm & hyperstation\code\obj\plushes.dmi in the Dream Daemon load tree to avoid loading unnecessary files. (if I removed anyones plushie for the server please let me know and i will fix it)
2022-04-27 00:54:37 -07:00
MrSky12
8d8dec54f9 Scale Sprite 2022-04-27 00:49:09 +02:00
SomeGuyEatingPie
4d91d7db3c Merge branch 'KabKebab:master' into master 2022-04-25 19:37:33 +01:00
MrSky12
e6bfd32d92 Merge pull request #10 from SomeGuyEatingPie/patch-2 Balls in the mouth
Fixed the Fix
2022-04-25 20:26:19 +02:00
SomeGuyEatingPie
5e435003cf Fixed the Fix
I fixed the fuck up I made when I tried to fix my fuck up
2022-04-25 19:25:38 +01:00
SomeGuyEatingPie
db4b6e40d4 Merge branch 'KabKebab:master' into master 2022-04-25 19:17:06 +01:00
MrSky12
2ccf2d7687 Merge pull request #9 from SomeGuyEatingPie/patch-1 He fixed his fuck up.
Fixed Genitals Disappearing
2022-04-25 20:12:39 +02:00
SomeGuyEatingPie
c00f40af59 Fixed Genitals Disapering
Fixed my fuckup
2022-04-25 19:11:05 +01:00
KabKebab
842ac7649d Merge pull request #8 from SimplySable/master
Bad Dog! (Dogborg Removal and other delights)
2022-04-25 13:37:14 +02:00
simplysable
b5268a00c6 Removed Dogborgs
This removes all of the dogborg options from the game and the upgrades that are tied to them.

(Players can no longer turn into a dogborg)

Did someone call for an exterminator?
2022-04-24 22:40:33 -07:00
simplysable
755c193e8c Update dildos.dm
Added Stun Time and BruteLoss for the "killer dildo".
when user uses "suicide" verb they climax instantly.
2022-04-24 22:20:03 -07:00
mirrormagic1
03784f73dd Merge branch 'master' of https://github.com/SimplySable/DoinItRight 2022-04-24 20:20:03 -04:00
mirrormagic1
624279f3b1 Update dildos.dm
Added the missing size adjective to the if statement.
2022-04-24 20:19:56 -04:00
MrSky12
e1682d5ba7 updated the AI mob. 2022-04-25 01:40:20 +02:00
SimplySable
81c3130e73 Update belly.dm
Adjusted Belly.DM file so it calls to the belly textures in hyperstation.
2022-04-24 16:26:25 -07:00
mirrormagic1
8ec1a4619a Merge branch 'master' of https://github.com/SimplySable/DoinItRight 2022-04-24 18:44:15 -04:00
mirrormagic1
7a53f54874 Merge branch 'KabKebab:master' into master 2022-04-24 18:39:05 -04:00
mirrormagic1
2a33f33487 Killer dildo addition
Added a killer dildo, Will kill you if you suicide with it twice. Does 100 brute, 20 oxy dmg, and stuns for 400 ticks.
item id: "obj/item/dildo/flared/killer"

Added the killer dildo sprite "dildo_flared_6"
2022-04-24 18:38:35 -04:00
halolegend2000
3a9eddc2ef more robots 2022-04-24 18:27:11 -04:00
mirrormagic1
7521766613 Update README.md
Added the Discord link to the readme.
2022-04-24 15:51:26 -04:00
mirrormagic1
3b3e07c13f Update README.md 2022-04-24 15:42:12 -04:00
halolegend2000
1c1790be84 updated robots
yes
2022-04-24 15:21:08 -04:00
MrSky12
d6422fac78 General Station ATMS :O 2022-04-23 23:12:29 +02:00
MrSky12
2852a4ebac A bigger update for everything!!
Added:
emoji
new ruins
a new vending machine??!
resprites for the welcome to kinaris lore is WIP rn.
etc.
2022-04-20 00:28:50 +02:00
MrSky12
3c6d16c072 Sprite changes
Added sprites and added looping to the mealdor.
2022-04-11 01:51:29 +02:00
MrSky12
067661852f Changed the hunter speed to be less speedy 2022-04-10 14:44:07 +02:00
KabKebab
8b2827d899 Merge pull request #7 from SomeGuyEatingPie/Map-Tweaks
Map tweaks
2022-04-09 20:25:21 +02:00
KabKebab
14877b29b6 Merge pull request #6 from SomeGuyEatingPie/New-Bellys
New bellys
2022-04-09 20:25:09 +02:00
MrSky12
80b9332b82 Mealdor resprite and other stuff added
Things added.

- Mealdor resprite
- Candle holder
- Updated Alien Away Mission Map
2022-04-09 20:03:33 +02:00
SomeGuyEatingPie
d0fc08dd7a More Funnies 2022-04-08 16:59:15 +01:00
SomeGuyEatingPie
30cbf3c96a Merge branch 'master' of https://github.com/SomeGuyEatingPie/GS13 2022-04-08 15:06:35 +01:00
SomeGuyEatingPie
059993820e Fallout Reference
Flask: "You take a sip from your trusty GS13 canteen."
2022-04-08 15:06:30 +01:00