Commit Graph

2377 Commits

Author SHA1 Message Date
ItsSelis
d958f9fbe2 Input Patches 2022-06-28 19:29:31 +02:00
Heroman
e70731d417 ALL runtimes
ALL runtimes
2022-06-23 18:48:28 +10:00
ItsSelis
fe3ad3b6ab Chaplain, multiline stuff and decimals 2022-06-20 18:39:09 +02:00
ItsSelis
cdd275939a Fixed missing usr 2022-06-19 12:38:09 +02:00
Casey
e0ef010384 Merge pull request #13114 from Heroman3003/happycarpet
Adds Happy carpet
2022-06-18 23:58:23 -04:00
Heroman
8e1b2e6ea1 Adds Happy carpet 2022-06-19 11:53:23 +10:00
ItsSelis
12611af1ee Merge branch 'master' of https://github.com/VOREStation/VOREStation into tgui-input-conversions 2022-06-19 03:05:08 +02:00
ItsSelis
06c9b26252 Input Conversion Part 1 2022-06-19 03:05:03 +02:00
Casey
0f7ef0cce1 Merge pull request #12800 from VOREStation/upstream-merge-8556
[MIRROR] Adds Some More Decorative Flooring Types
2022-06-18 20:44:13 -04:00
VerySoft
f7f9d4f5f0 Fixy 2022-06-18 20:31:11 -04:00
ItsSelis
4a9784c2a0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8644-fix 2022-06-18 14:58:10 +02:00
ItsSelis
bb87687017 Resolve conflicts 2022-06-18 14:57:51 +02:00
Heroman
9dd26d165f Reduces crate cost 2022-06-17 15:48:39 +10:00
Heroman
8d2ca22a15 Makes unathi breacher rig (NT version) orderable at cargo 2022-06-12 20:55:45 +10:00
Ketrai
0937f3a381 Cooking QOL V2 2022-06-05 20:17:44 -04:00
lm40
28f608b5cd localizes religion and adds custom chaplain titles 2022-06-03 18:44:48 -04:00
Casey
f067be6ede Merge pull request #12953 from FartMaster69420/sleevecard-pai
Sleevecard simplification and features
2022-05-22 14:16:37 -04:00
Foopwo
88df7b3993 Added donksoft gun and size gun upgrades for borgs 2022-05-14 19:41:26 -07:00
Heroman
5e181fb78b Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NOT KNOW HOW IT IS RELATED IT JUST IS 2022-05-14 19:13:45 +10:00
FartMaster69420
53826a8a76 Initial
Making sleevecards a subtype of pais
2022-05-10 19:48:41 -04:00
ItsSelis
69f70e19c2 Dosimeters 2022-04-30 18:01:12 +02:00
Atermonera
8ebd0590e6 Changeling Menu Now Shows Cost 2022-04-27 02:51:27 -04:00
Sypsoti
4cbe9a028e Adds Some More Decorative Flooring Types 2022-04-19 12:12:56 -04:00
Spookerton
b9a21b121f Merge pull request #8535 from Cerebulon/dressshirts
Dress Shirt Undershirts
2022-04-15 05:41:32 -04:00
Heroman
f4d1f825f7 Nerfs gravitons and morphium, adds lots of boards into autolathe 2022-04-09 05:44:36 +10:00
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