Commit Graph

2293 Commits

Author SHA1 Message Date
Heroman
8b9abe582c Fixes comfy chair colors 2022-12-29 16:43:48 +10:00
VerySoft
3d68829188 ONE MORE AAAAAAAAA 2022-12-28 19:27:37 -05:00
VerySoft
115340158c last tweak 2022-12-28 19:22:30 -05:00
VerySoft
6b93d42a10 More tweaks! 2022-12-28 19:06:55 -05:00
VerySoft
393ca25990 adds comments 2022-12-28 18:57:55 -05:00
VerySoft
9248ec15da Maint pred cancel tweak
should fix #12034
2022-12-28 18:53:04 -05:00
Heroman
d7d91dc10e two borg fixes 2022-12-27 07:30:17 +10:00
Pandora
9c32488fe2 Update misc_vr.dm 2022-12-25 17:28:39 +00:00
Unknown
90effc3caf Fixes some Oversights
- Removes Phasers from cargo ordering
- Removes weapons and combat armor from Talon
- Renames access_awayteam back to access_explorer for compatibility reasons
- Standardizes the itempath of the buffer device across all three maps.
2022-12-23 19:25:47 -05:00
VerySoft
ed03ce8262 Yeah! 2022-12-22 01:27:29 -05:00
VerySoft
415742c4f0 c: 2022-12-21 04:34:05 -05:00
Atermonera
d950e35905 Greenjoe12345/xmas2022 2022-12-13 22:02:58 -05:00
Runa Dacino
f71e2d2bac Fixes timetravel
changes book to be 24th not 26th century

more date stuff, fixes guns

typos

Updates POI lore for nuclear rack and growth canisters
2022-12-03 12:23:34 +01:00
Heroman3003
975c054c28 Merge pull request #14096 from Novacat/nova-basicfixes
Trash pile adjustments
2022-11-21 14:33:14 +10:00
Unknown
80726f79df Adds size standardization bracelets (including emagged variant) 2022-11-17 08:46:30 -05:00
Unknown
c946a1db67 Removes emags from trash piles entirely. 2022-11-17 00:31:17 -05:00
Unknown
cb641251ea More tweaks 2022-11-16 22:40:46 -05:00
Unknown
5a295da794 Trash pile adjustments. 2022-11-16 22:37:09 -05:00
Heroman
b1ecd5d858 Hopefully fixes corner sofas 2022-11-11 16:21:04 +10:00
Heroman
ca4d72b34a Removes all cabinets instead of making functional ones spawn empty 2022-11-05 16:17:05 +10:00
Heroman
1957fca543 Axes the axes 2022-11-05 08:22:28 +10:00
TheDavestDave
a9a2029e4c adds a pair of great tits to cargo
sorely needed
2022-10-24 19:05:12 +01:00
Killian
33efd08ddb talon, vb, and typhon fixes 2022-10-12 13:25:58 +01:00
Casey
db4e6f1c9d Merge pull request #13867 from VOREStation/upstream-merge-8721
[MIRROR] A -ton of Flags [READY FOR MERGE]
2022-10-09 23:05:46 -04:00
C.L
304e6b960e Fixes icon_states, swaps to initialize(), adds original_sign 2022-10-07 22:33:36 -04:00
C.L
b05a3491d7 Update signs.dm 2022-10-07 22:27:38 -04:00
C.L
80d85e969c Update signs.dm 2022-10-07 22:26:01 -04:00
Spookerton
c537bec138 A -ton of Flags 2022-10-07 16:10:11 -04:00
C.L
e8b88fccd7 Makes flight make more sense.
- Makes flight let you fly over snow
- Makes flight let you fly over water
- Makes flight let you fly over leeches
- Makes flight let you fly off cliffs
- Makes flight let you fly over mines. (I'm not sure. This shouldn't really ever happen anyways since mines aren't generally in use. If it's a problem I can just remove it.)
2022-10-06 01:22:53 -04:00
Casey
420957ffec Merge pull request #13828 from Cameron653/BUILDABLE_SHUTTLES
Blueprint Revamp.
2022-10-02 13:59:10 -04:00
C.L
6eb311dc1d More changes
- Makes a special wire reader tool that the CE starts with
- Makes CE blueprints able to add charges to Engineer's blueprints.
- Makes it so CE blueprints don't have the wire legend.
- Adds Engineer's blueprints to the Engineer's lockers.
- Adds Engineer's blueprints.
- Makes it so you can't make a new area in a non 'BUILDABLE_AREA_TYPES' area without CE blueprints. (See global_lists_vr).
2022-10-01 21:04:47 -04:00
C.L
b103587ec6 Replaces references to blueprints.
Old blueprints are gone now.
2022-10-01 02:04:59 -04:00
C.L
31a2a3a4b8 Adds in 'compliance implant'
- Adds in a 'compliance implant'. This is an implant that works just like a compliance disk, in case people want to do law stuff without NIFs. (Also works on NIFs as well as requested.)
- Is able to be found in contraband packs, trash piles, and is contraband in the security vending machine. (Since putting it in the 'gadget' vending machine didn't seem right.)

Works exactly like a compliance disk does but also is a removable implant for non-NIF'd people.
2022-09-29 19:38:56 -04:00
Heroman
f6b6ff0486 Fixes ADMIN: EVENT 2022-09-26 05:55:52 +10:00
VirgoBot
d67a95c46f [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) (#13010)
* Fixes directional overlays on padded comfy and rounded chairs

* Fixes mirror conflicts (#13411)

* Update chairs.dm

* Update chairs.dm

Co-authored-by: Cerebulon <tanhindmarsh@yahoo.com>
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:07:39 -04:00
VirgoBot
e5b8c8051c [MIRROR] Airlock assembly naming window starts with base_name (ABLE TO BE MERGED) (#13621)
* Airlock assembly naming window starts with base_name

* Update door_assembly.dm

Co-authored-by: Spookerton <spkrtn@pm.me>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:03:54 -04:00
VirgoBot
1144101012 [MIRROR] Adds job winter coats to job lockers (ABLE TO BE MERGED) (#12904)
* Adds job winter coats to job lockers

* Update hooded.dm

* Update wardrobe.dm

* Update security.dm

* Update scientist.dm

* Update medical.dm

* Update cargo.dm

* Update job_closets.dm

* Update job_closets.dm

* Update hooded.dm

Co-authored-by: Spookerton <spkrtn@pm.me>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:02:22 -04:00
Heroman
e9687e294b Fixes a few more runtimes 2022-09-06 05:37:37 +10:00
Novacat
1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
Novacat
13c044388b Revert "Fixes chair wrong color thing" 2022-08-27 08:36:27 -04:00
Heroman
2be9f1be7c Fixes chair wrong color thing 2022-08-27 14:20:09 +10:00
MistakeNot4892
d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
MistakeNot4892
7082955d23 Fix linter fails due to sleeping in Initialize(). 2022-08-25 14:16:33 +10:00
Heroman
c01715b0d6 Optimizes shower's turf washing a bit 2022-08-09 15:20:26 +10:00
Eli Atonis
e8e05d96ef Ghost spawning as mice from trash piles
Added the ability for observers to click on trash piles to trigger the mouse spawn prompt. Doing so spawns them on the pile with the same "crawls out of the trash" message a normal mouse would trigger.
2022-07-26 07:13:07 +10:00
Casey
91a3343c00 Merge pull request #13372 from Screemonster/braaaaiiiins
makes brainzsnax obtainable ingame
2022-07-20 13:24:08 -04:00
DESKTOP-4BUBN9N\Mike
7e48983bfb makes brainzsnax obtainable ingame 2022-07-20 12:40:20 +01:00
Heroman
8a9df3b2ea Fixes in-chat icons being broken 2022-07-20 18:55:27 +10:00
Casey
c527964372 Merge pull request #13346 from Heroman3003/doubleclosets
Adds double engi closets for SD and RP
2022-07-17 05:31:18 -04:00
VerySoft
6688ff95a6 Buffs Blockers and alters the new sound toggle verbs again
I added hyphens instead of spaces for the new verbs because typing any of the verbs they relate to in the bottom bar defaults to the toggle verb instead of the normal verb. :U

With the hyphens instead of spaces it doesn't do that anymore!
2022-07-17 00:37:28 -04:00