Commit Graph

16398 Commits

Author SHA1 Message Date
RadiantFlash7
484e80f9c8 Revert "2.22"
This reverts commit e74d277ce5.
2020-01-12 01:15:56 -05:00
RadiantFlash7
0efe43dc44 Revert "fixing indentation error"
This reverts commit 3b021863b5.
2020-01-12 01:15:53 -05:00
RadiantFlash7
9e88c4f613 Revert "2.24"
This reverts commit 77217e2baa.
2020-01-12 01:15:51 -05:00
RadiantFlash7
77217e2baa 2.24
Please stop bitching at me travis ;-;
2020-01-12 01:09:00 -05:00
RadiantFlash7
3b021863b5 fixing indentation error
Iiis this the problem?
2020-01-12 00:56:16 -05:00
RadiantFlash7
e74d277ce5 2.22
I swear if this is the issue, i'ma cry.
2020-01-12 00:39:20 -05:00
RadiantFlash7
fd22b5ca87 Major map change+misc changes
Moves holodeck next to AI core,
expands botany and kitchen, adds fishfarm
Adds photocopiers and pappershredders about.
Fixes some bad cameras,
adds detective pistol back in, Why wasn't it there prior?
Adds ballestics back in.
2020-01-11 18:41:51 -05:00
RadiantFlash7
373ad52953 Merge pull request #1 from Yawn-Wider/master
Updating repo
2020-01-06 18:14:36 -05:00
RadiantFlash7
99fa945df9 January patch #2.1
Adds ballestics to vendor as per previous discussion on ballestics for security.
Adds missing photocopiers tomap,
and some icepicks at escape eva area.
2020-01-06 18:13:27 -05:00
Hawk_v3
838f5e9418 Merge remote-tracking branch 'upstream/master' 2020-01-06 00:47:53 +00:00
Hawk_v3
717207490a Merge remote-tracking branch 'server/master' 2020-01-06 00:00:30 +00:00
Heroman
e05fdf6258 Fixes clamp issues 2020-01-06 08:37:27 +10:00
RadiantFlash7
e6c412c0ba More fixes
Re-enables new signs.dm
Removes the new sign code from signs.dm
adjusts maintence.dmm for new pathways of signs.
2020-01-05 11:31:31 -05:00
Mechoid
c3079004ea GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-05 01:39:28 -05:00
RadiantFlash7
e26b48d335 Map fixes.
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
2020-01-05 01:09:08 -05:00
lbnesquik
f2245e7d7d Merge branch 'master' of https://github.com/VOREStation/VOREStation 2020-01-03 22:48:39 +01:00
lbnesquik
e772c1a09b Add ambrosia seed as a somewhat rare loot for trash.
Why is this good:
- Low level illegal stuff to do
- I can make my pothead characters
- This is like the most common illegal drug ever, so having it being harder to get than size guns or basically anything in R&D is weird.
- What are you going to do with weed besides smoke it anyway?
2020-01-03 22:47:32 +01:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes
Misc Changes and bugfixes
2019-12-31 18:39:10 -05:00
Cebutris
b22008f01f i probably should have tried to compile this before making the PR but i'm not that smart 2019-12-31 05:06:37 -05:00
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01:00
Hawk_v3
0b9ec94000 Merge remote-tracking branch 'server/master' 2019-12-29 20:34:44 +00:00
Repede
c4ec1d73d2 Disables mob doing snow steps 2019-12-29 14:25:07 -05:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
RadiantFlash7
c4d040a9f3 Snowsounds+awaymission
Adds some intercoms, adds snow sounds to snow,
Adds upgrades to whiskey station away mission.
2019-12-29 03:14:54 -05:00
Heroman
572112d28b Fixes AI not being able to resist out of nets 2019-12-29 08:33:10 +10:00
Repede
3c621e09b0 Merge branch 'master' into master 2019-12-26 23:47:53 -05:00
Repede
2af9f4ee44 Merge branch 'master' into master 2019-12-26 20:40:10 -05:00
Repede
7f8ec161c5 Merge branch 'master' into map 2019-12-26 20:34:13 -05:00
RadiantFlash7
7c56c63235 Merge branch 'map' of https://github.com/RadiantFlash7/YWPolarisVore into map 2019-12-26 20:30:07 -05:00
RadiantFlash7
885025be77 map fixes
Adds some rad shelters on the mining z level,
Ensures all small maint pockets are rad hsielded, Fixes some access issues in differant places.
2019-12-26 20:30:05 -05:00
lbnesquik
562df07602 Move the lance sprite to weapons_vr.dmi. 2019-12-26 07:25:49 +01:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea Introduce more taur clothes.
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
2019-12-25 20:40:21 +01:00
Unknown
dced9171d9 mow 2019-12-25 14:00:18 -05:00
Unknown
63f2fc0f20 Repurposing FTW 2019-12-25 13:54:31 -05:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Shadow
c59e362fb5 Adds Change Tags 2019-12-22 21:14:09 -06:00
Shadow
d4e45ee3b1 Adds the Booze Borg 2019-12-22 20:02:36 -06:00
Repede
ecb31d04e0 Merge branch 'master' into master 2019-12-22 11:51:38 -05:00
Novacat
acc510a92e Merge pull request #6354 from VOREStation/upstream-merge-6480
[MIRROR] Fixes mech projectile armor thinking test projectiles are dangerous
2019-12-22 11:01:23 -05:00
Unknown
26a1bca72d Compatibility Fixes One 2019-12-22 10:52:45 -05:00
Atermonera
2ec24a29e3 Merge pull request #6580 from Shadow-Quill/APC-AirAlarm-Alt-Click
APCs/Air Alarms can be (un)locked via altclick
2019-12-22 01:58:19 -05:00
Atermonera
eeb8310aa2 Fixes mech projectile armor thinking test projectiles are dangerous 2019-12-21 23:58:07 -05:00
Repede
b41698c720 Merge branch 'master' into master 2019-12-21 21:35:09 -05:00
Repede
e32dc05ba3 Merge branch 'master' into Air-APC-QOL 2019-12-21 21:34:54 -05:00
Repede
a24dad8b7e Merge branch 'master' into map 2019-12-21 21:00:24 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
RadiantFlash7
a60ef71680 exploration cameras
Mass camera fixes and holopad fixes!
Also fixes dorm 9.
2019-12-21 16:23:46 -05:00
Atermonera
6b462af3ee Merge pull request #6569 from TheFurryFeline/TFF-Bulbs_Recycling
Light Replacer QOL
2019-12-21 14:31:10 -05:00