cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,618 Commits 8 Branches 26 Tags
d950e359056d2995b7dc90ffa3f3031663f94781
Commit Graph

2410 Commits

Author SHA1 Message Date
VerySoft
8b4ba9deec every time I say it's the final one it's not 2022-11-21 01:27:52 -05:00
VerySoft
0de70cff65 Finished up 2022-11-21 00:10:49 -05:00
VerySoft
96dae60e45 Ticket Printer 
New toy for sec
 2022-11-20 20:06:39 -05:00
Killian
68d0d69e0d Update misc_vr.dm 2022-11-16 19:58:05 +00:00
Heroman
cf704c9c7b Typo fix 2022-10-30 05:49:49 +10:00
Heroman
f6d78e4ccf Fixes inserting sheets with no defined material (like tiles) into machines 2022-10-30 05:39:20 +10:00
Heroman3003
c813361179 Merge pull request #14002 from VOREStation/upstream-merge-8776 
[MIRROR] Snowmobiles and Quadhancements V2
 2022-10-29 17:40:04 +10:00
Cerebulon
eba08a1c71 Snowmobiles and Quadhancements V2 2022-10-28 19:45:03 -04:00
TheDavestDave
a9a2029e4c adds a pair of great tits to cargo 
sorely needed
 2022-10-24 19:05:12 +01:00
Guy
c1576021a9 Adds the tactical AR visor. 2022-10-18 17:43:52 -03:00
Casey
f9e61429dc Merge pull request #13884 from Cameron653/TRANS-SOCKS 
Adds more sock variants
 2022-10-09 23:08:42 -04:00
C.L
362eeca304 typo 2022-10-08 23:10:18 -04:00
C.L
4e21999a9d Adds more socks 
Adds coder socks and more.

Adds more socks.
ADDED SOCKS:
White, Short White, White Knee, White Thigh.
Black, Short Black, Black Knee, Black Thigh.
Striped USA Knee/Thigh socks.
UK Knee/Thigh socks
Yellow-Red Knee/Thigh socks
Stockings: Light pink, Purple, Green, Cyan, Orange, Yellow, Dark Pink, Blue.
Bee Thigh/Knee socks.
THOCKS
Ace Pride Knee/Thigh socks.
Trans Pride Knee/Thigh socks

has_color means you CAN color it.

you too
 2022-10-08 23:09:03 -04:00
C.L
e85bdb061b Upgrades OverlaySS. Fixes #3627 
Tested on my test server and nothing appeared to be broken. Overlays were showing up as expected.

Ghosts no longer became space/stairs/stole someone's tail
 2022-10-05 11:16:58 -04:00
C.L
c0c8ca6eb6 god has left us 
MAJOR:
- Completely revamps the blueprints.
- Ports /tg/ blueprints and bastardizes them.

Blueprint functions:
- Create/modify an existing area (in a 3x3 square. Good for expanding an area to include walls or finetuning)
- Create new area or merge two areas. (Allows you to make a new area if the room is airtight or merge two areas together.)
- Change area name.
- Wire Legend. Allows you to see what wires do. (Move this into its own seperate item)

MINOR:
- Adds a new global list "wire_name_directory" that is important for revealing wires.
- Gave vent pumps, vent scrubbers, and air alarms a new update_area proc that is involved when their area is updated due to a blueprints being used.
- Gave areas a 'setup' proc that is called when a new area is created via blueprints. Sets the area vars to what would be default (power off) Adds a new 'areasize' variable to areas that lets you know how large they are.
- Added procs to areas to check the power in an area and check change the name of an area properly.
- adds a new range_turfs and rect_turfs define. Unused for now.
 2022-09-30 20:50:10 -04:00
VirgoBot
c2150bf8b6 [MIRROR] Antag Uplink Medical Adjustments (ABLE TO BE MERGED) (#13460) 
* Antag Uplink Medical Adjustments

* Update medical.dm

* Update medical.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:23:00 -04:00
VirgoBot
67059e3634 [MIRROR] Bartending enhancements (ABLE TO BE MERGED) (#12971) 
* Bartending enhancements

* Update glass.dm

* Update drinks.dm

* Update drinks.dm

* Update hospitality.dm

* Update dispenser_presets.dm

* Update dispenser_presets.dm

* Update vending_machines.dm

* Update vending_machines.dm

* Update chemical.dmi

* Revert "Update chemical.dmi"

This reverts commit abc8ba097c.

* Update chemical.dmi

* Update cartridge_presets.dm

* squish

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:05:14 -04:00
VirgoBot
de58b679e2 [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED) (#12899) 
* Adds Sjorgen Inertial Shotgun (by H-H)

* Update munitions.dm

* Update visible_weapons.dm

* Update shotgun.dm

* Update guns_and_ammo.dm

* Update munitions.dm

* Update guns_and_ammo.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:05:00 -04:00
VirgoBot
69b99194c5 [MIRROR] Concealed Cane Sword (ABLE TO BE MERGED) (#13089) 
* Concealed Cane Sword

* Update stealthy_weapons.dm

* Update canes.dm

* Update canes.dm

* Ports weapon.dmi sprites from Polaris

* Update swords.dm

* Update swords.dm

* Update canes.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:04:24 -04:00
VirgoBot
1a8f1760fa [MIRROR] conk rete (ABLE TO BE MERGED) (#13467) 
* conk rete

* Update flooring_premade.dm

* Update wall_types.dm

* Update _materials.dm

* Update plasteel.dm

* Update steel.dm

* Update stone.dm

* Update stone.dm

* Update instant.dm

* Update plasteel.dm

* Fixes map changes

Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:03:19 -04:00
VirgoBot
eccc890eb1 [MIRROR] Uplink Armor Point Adjustments (ABLE TO BE MERGED) (#13509) 
* Uplink Armor Point Adjustments

* Update armor.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:02:47 -04:00
Heroman
0123fff2b9 Removes hotfood vendors from station spawning 2022-09-21 08:47:03 +10:00
C.L
fab0a74144 Makes admin portals not teleport you everywhere 2022-09-03 16:36:21 -04:00
Novacat
1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
Novacat
5b45f17809 Merge pull request #11826 from VOREStation/upstream-merge-8298 
[MIRROR] /atom New() => Initialize() [MDB IGNORE]
 2022-08-26 18:12:56 -04:00
MistakeNot4892
d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
Heroman
be6a441d68 Adds Altevian cuisine 2022-08-24 16:23:14 +10:00
C.L
57dca443f4 compile 
Compile!
 2022-08-23 17:47:05 -04:00
Spookerton
ed64c13c56 Adjustments to Uplink Tools cost 2022-08-23 17:40:27 -04:00
lm40
68d642c2f2 Update teleport.dm 2022-08-20 10:41:54 -04:00
Heroman
8a9df3b2ea Fixes in-chat icons being broken 2022-07-20 18:55:27 +10:00
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