Commit Graph

2352 Commits

Author SHA1 Message Date
Casey
b9473ccb94 Merge pull request #12592 from GhostActual/tg-port-6
The Grand /TG Port - Part 6
2022-04-02 23:31:31 -04:00
GhostActual
81c603f9d5 Base Commit 2022-04-02 22:54:14 -04:00
GhostActual
3d57004141 Base Commit 2022-04-01 13:45:16 -04:00
Pandora
25d1bbeba7 fucky lists 2022-03-22 17:57:15 +00:00
GhostActual
96d2da15a3 Base Commit
Update shotgun.dm

Final Commit?

Final
2022-03-21 05:02:08 -04:00
Pandora
69f69b5fe0 Update outfit.dm 2022-03-20 17:00:15 +00:00
Pandora
a965332861 I'm going to find out if I'm really alive 2022-03-13 08:55:09 +00:00
VerySoft
93b1160eb3 Actually check for the proper stats 2022-03-09 17:33:06 -05:00
VerySoft
f44aa8adbf Vore Stats
Adds some vore stats to the end of round trivia thing. 

Includes number of times any mob with a ckey was eaten, digested, or absorbed.

Also includes number of items digested.
2022-03-09 17:31:02 -05:00
Heroman
fbb0a65231 Brings REAL cookies to everywhere they belong 2022-03-07 18:44:53 +10:00
Casey
27b451a2c8 Merge pull request #12353 from GhostActual/Ammo_Boxes
Ammo Boxes
2022-03-03 16:22:34 -05:00
klaasjared
8626b52844 Small Fix 2022-03-01 19:47:45 -05:00
klaasjared
e4ed93e11d Shotgun Ammo Boxes
Replaces all ammo boxes with new ammo box type (Alt-Click to remove shells) - put in separate Commit in case Admins don't want this

(Compile Fixes)
2022-03-01 01:27:54 -05:00
klaasjared
dc2bc419c1 Secondary Commit 2022-02-28 22:17:03 -05:00
TheDavestDave
1dd497e653 Update munitions_vr.dm 2022-02-26 14:00:31 +00:00
TheDavestDave
57133a2e17 updoot 2022-02-26 13:56:02 +00:00
TheDavestDave
5f4ec6f6de move to cargo 2022-02-26 01:33:59 +00:00
Heroman
d788a61aa4 Compile error resolution 2022-02-19 19:42:32 +10:00
Casey
1432ca2b22 Merge pull request #12253 from GhostActual/Donk-Co.-Toys
Donk Co. Toys
2022-02-18 23:26:48 -05:00
TheDavestDave
c2c4ffb85d unwanted ) bannished to the shadow realm 2022-02-19 02:20:52 +00:00
TheDavestDave
08d0304039 updoot
macth with updoot
2022-02-19 02:18:35 +00:00
TheDavestDave
edbf41d089 Merge branch 'VOREStation:master' into primative-shield-2 2022-02-19 02:16:27 +00:00
TheDavestDave
055f4699d1 lower tech shield
requested changes by soft.  Uses a wooden bucket instead of a metal one, and cloth instead of cable coils.
2022-02-19 02:09:06 +00:00
PastelPrinceDan
04a0d8a760 we make sense here 2022-02-18 09:21:29 +00:00
klaasjared
8a5afc9d6f Small Fix 2022-02-17 21:04:05 -05:00
klaasjared
2c312f71a0 Ruin Marine 2022-02-17 21:04:05 -05:00
klaasjared
e8e7bf3990 Toy Guns
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
TheDavestDave
6dcadd97c0 primative-shields
a primitive shield, perfect for the next knights at castle mystic event.

it's much less cool, there's no metal ones. but it's literally the only low tech shield in our code right.

No really all other shields are made of plastic like the riot shield, or energy like halo jackles.

anyway it has 10 lower block chance than the explo shield and 20 less than riot. It's planks off wood and a bucket tied together
2022-02-17 15:14:18 +00:00
Heroman
19e522b437 Adds vendor refill cartridges to cargo 2022-02-15 07:08:16 +10:00
Unknown
2558a66fb2 Adds pouch of holding to uplink 2022-02-07 15:12:25 -05:00
VerySoft
36ab4d8e5c The final Item Bank patch?
Adds a few more restrictions, adds a confirmation prompt that warns about potential loss of contents, and checks contents for prohibited items.
2022-02-06 18:15:22 -05:00
PastelPrinceDan
25c1f8ed29 catslug (contained) 2022-02-05 18:33:39 +00:00
Casey
fa63b54ef7 Merge pull request #12092 from VOREStation/upstream-merge-8369
[MIRROR] Adds a roof to indoor rain sounds
2022-01-28 17:19:34 -05:00
Atermonera
3e2313765b Merge pull request #8369 from Cerebulon/indoorrain
Adds a roof to indoor rain sounds
2022-01-18 21:10:19 -05:00
TheDavestDave
71081477f0 Update misc_vr.dm 2022-01-17 00:17:52 +00:00
TheDavestDave
a6b97320b9 I don't know why I need to set a name for the crate three times but I only did it twice
sword crate should spawn now
2022-01-09 21:03:39 +00:00
Casey
bcd2afd09c Merge pull request #12048 from Verkister/ponyshow2
Fixes riding offsets not counting rider size
2022-01-08 12:53:52 -05:00
Verkister
7cae8d2016 Fixes riding offsets not counting rider size
Fixes riding offsets not counting rider size or the difference between the two, which would end up resulting in small riders on large mounts sitting nowhere near the back of the mount
2022-01-08 18:45:06 +02:00
TheDavestDave
9ae21b2886 Update misc_vr.dm 2022-01-03 18:53:55 +00:00
TheDavestDave
9160a087bc adds swords to cargo crate
xenoach is currently the only way to get real swords for players
2022-01-03 18:49:44 +00:00
PastelPrinceDan
1efc116c6a also adds a cost to normal autoinjectors 2021-12-16 08:50:32 +00:00
PastelPrinceDan
7b3bafdf38 cheaper :) 2021-12-16 08:30:01 +00:00
Casey
ea36f8366e Merge pull request #11910 from PastelPrinceDan/cratefix
fixes the commonwealth engi RIG having the wrong crate
2021-11-22 23:42:15 -05:00
Casey
50e9e70486 Merge pull request #11901 from Heroman3003/sheetfix
Fixes a bug with sheet storage and drawing too much
2021-11-22 23:37:22 -05:00
PastelPrinceDan
b1708899fc easy fix 2021-11-23 02:23:33 +00:00
Heroman
dfa8c55180 Also fixes nullvoid 0-stack issues 2021-11-22 16:13:36 +10:00
Heroman
5438a64e64 Adds prefs for Corgi and Cursed Sword roles 2021-11-21 12:42:53 +10:00
PastelPrinceDan
246373c24d i don't want a lot for christmas
there is just one thing i need
2021-11-04 10:06:00 +00:00
Aronai Sieyes
b4ce0442cd Merge pull request #11722 from KillianKirilenko/kk-misc
Hardwood Material Port
2021-10-30 17:25:23 -04:00
Killian
fefda7e0da Update munitions_vr.dm 2021-10-30 09:49:42 +01:00