Commit Graph

1901 Commits

Author SHA1 Message Date
Shadowfire
e98aec9157 Casinoship map rework!
Changed up casino ship to have a nice garden and also pool and sauna, removed some redundant dorm rooms, shifted things around a bit to make it a little less spacious and empty. Also added things from all the improvements Ive made!
2020-03-09 21:06:46 +01:00
Shadowfire
f6daac300f fixy fix
Okay, fixed a lot of issues and reacted to the comments to parts of commit, hopefully we will get a nice pretty travis report this time
2020-03-09 15:31:04 +01:00
Shadowfire
3c3817ecd3 Bug fixing, improvements to furniture, jukebox change
Made casino jukebox music finally only appear on its proper jukebox
made tiles have material variable, allowing recovery of carpets from padding
made carpets give padding different colors
made stools also benefit from colored padding
Made modular sofas able to be made from plasteel and plastic
2020-03-07 09:49:36 +01:00
Shadowfire117
010f01bf30 Sofa additions
wooden sofas now have correct color
made addition so the modular sofas also change sprites/color with materials
2020-03-04 11:37:51 +01:00
Nadyr
8fd3b260da Merge pull request #218 from Shadowfire117/Casinoport
Casino port!
2020-02-17 22:59:14 -05:00
TheFurryFeline
5859b28dbe I Got No Wood
Changelog Notes:

- Prevents wood generation exploit for the holodeck that lets you get wood from holodeck generated dead/pine trees.

- Thus adding holodeck variation.
2020-02-15 22:40:47 -05:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Razgriz
555cc64454 Merge pull request #225 from D-H-A/master
Stair Decals and a Boxing Ring
2020-02-12 15:39:39 -07:00
DHA
4adfbb57f4 Boxing Ring files & Icons
Currently uses procs from window.dm. Might change in the future.
2020-02-12 06:41:04 -08:00
RadiantFlash7
fc1015a0a6 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-02-07 19:57:01 -05:00
RadiantFlash7
b5142f5077 RPD Changes
Map fixes and changes!
Adds RPD to science,
Removes RPD from locker, leaves one on table in atmosia.
Removes APC for cryogaia compound. should be able to make new buildings/rooms now.
2020-02-07 19:56:57 -05:00
Shadowfire
57464baadc port 0.9.9.9
just uploading so others can see work, still not ready for commitment
2020-02-08 01:11:36 +01:00
Killian
7d0bed5e4f add new clothes 2020-02-05 21:50:32 +00:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
2020-01-31 18:23:50 +01:00
lbnesquik
7970a9516a Forgot a to_chat( edit. 2020-01-22 08:52:17 +01:00
lbnesquik
b93e2c2a96 Add chomp pointers & correct typos 2020-01-22 08:49:46 +01:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
lbnesquik
83eeb5f5d7 Add an Examine to Bonfires 2020-01-19 16:01:28 +01:00
Unknown
d3aa3bed3c Removes gnomes
https://cdn.discordapp.com/attachments/173832207784214528/666485419747180554/7f1b99fdd795299aabd6ddef202ecf98.png

This is why we cannot have nice things.
2020-01-13 22:49:15 -05:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +00:00
Hawk_v3
4c18d156cd Actual fix.
Commas MUST go on the end of comments in the middle of a list. The fail is normally the line ABOVE the one Travis reports.
2020-01-13 19:06:19 +00:00
Hawk_v3
f36bda0ffd Or is this the list fix? I can't read AWK and regex.
I know where the file IS, just...
2020-01-13 19:01:15 +00:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Novacat
c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
2020-01-12 22:14:17 -05:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure
You've been gnomed.
2020-01-12 22:02:41 -05:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Holdelta
9c7e1f82af Fixing Travis formatting part 2
Adding a parenthesis at the end of a comment because Travis.
2020-01-12 15:44:47 -08:00
Hawk_v3
697641a913 Indentation Fix
Travis checks for proper closure. While this might not actually fix it, it's expecting to see ) at the end of the line, as I've run into this one before.
2020-01-12 23:30:34 +00:00
Heroman
06b5064a8e Makes drone pods remain active after first attempt, allowing a ghost to click on it to enter 2020-01-13 07:21:48 +10:00
Holdelta
a306d5fd4e Update engineering.dm 2020-01-11 23:34:21 -08:00
Holdelta
0624435524 Update engineering.dm 2020-01-11 23:32:56 -08:00
drexample
041db96898 WE ALWAYS DELIVER 2020-01-11 23:22:18 +03:00
drexample
1be4fe8b3c hooh 2020-01-11 06:42:54 +03:00
drexample
747114793c WE ALWAYS DELIVER! 2020-01-11 05:28:00 +03:00
Heroman
b5f0e0affe Fixes wrong gasmask in xenoflorist locker 2020-01-11 10:39:08 +10:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Hawk_v3
838f5e9418 Merge remote-tracking branch 'upstream/master' 2020-01-06 00:47:53 +00:00
Mechoid
c3079004ea GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-05 01:39:28 -05: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
TheFurryFeline
71a99a94c0 Derp
Comments, please.
2020-01-02 13:49:31 -05:00
TheFurryFeline
716741d67f Redo of Mapfix Palooza Round One
Redoing Mapfix Palooza with notable changes being the re-removal of the NSFW gun with comment for YW's removal. Keeping the dorm additions undone pending a followup PR.

Changelog Notes:

- Removes random SMES in maints mapped in for Research.

- Rearranges items in HOS Office and adds gear closet with weapon power cell.

- Add AR-B glasses to CD Office and plain AR glasses to HOP.

- Add missing shortwave radios to the bridge.

- OR rooms rearranged.

- - Anasthetic wall pumps added.

- - Anasthetic wall closets removed.

- - Surgery tools, table, monitor, IV drips moved.

- - Add anesthetic floor-based closets as a reserve.

- - Minor increase in area size.

- Exploration rewards vendor moved to explorer areas on outpost. Deletes the one in Research wall. Also rearranges spawnpoints for explorers on the surface.

- Add medical access to field medic section at Main Outpost FA Station.

- Add Mining redemption vendor. Resolves #28

- Moves lights in several places to not be in the same spot as cameras.

- Fixes APCs at Xenoresearch being turned off as well as access into the sub-department. Also removes exploration vendor.

- Internal second button added in engine room for going in and out of the SMES room.

- Mech Bay shutter name fix. Was labelled Mining Storage.

- Fixes blindspots for cameras.

- Railings for hangar bays for safety reasons.

- Door access fixes.

- - Remove access restrictions on FA Stations.

- - Fix access for Red Armoury preventing HOS entry.

- - Fix access for surface teleporter room preventing RD entry.
Fix access for CE into T-comms. Resolves #24

- - Gives Armoury what it had for Northern Star.

- Dorm tweaks.

- - Locks added to heads' bedrooms on deck 3 as well as visitor rooms on deck 3.

- Increases main power SMES energy amount.

- Remove extra AI Status Display Monitor in QM Office.

- Add a bunch of brollies to hangar bays, explorer lockers, and field medic lockers. Resolves #60

- Add Body Designer to Medbay Lobby. Also adds the box that goes with it. Resolves #23

- Adds Erik's Lungs back. Rejoice, you food pupper! Closes #48

- Adds Timeclocks for switching on/off duty.

- Adds a bino to each exploration locker for FMs and Explorers. Resolves #67

- Gives QM a fax machine and adds 2 more public ones. One at new dorms and the other at the library.
2020-01-02 13:09:20 -05:00
Razgriz
180efa5a50 Remove NSFW gun
Locker already has the X01 gun.
2020-01-02 05:57:15 -07:00
TheFurryFeline
2bbd16372a Derp 2019-12-31 20:20:50 -05:00
TheFurryFeline
d191dc6b88 Mapfix Palooza Round One
Changelog Notes:

- Removes random SMES in maints mapped in for Research.

- Rearranges items in HOS Office and adds gear closet with weapon power cell. Also re-add NSFW gun that was commented out.

- Add AR-B glasses to CD Office and plain AR glasses to HOP.

- Add missing shortwave radios to the bridge.

- OR rooms rearranged.

- - Anasthetic wall pumps added.

- - Anasthetic wall closets removed.

- - Surgery tools, table, monitor, IV drips moved.

- - Add anesthetic floor-based closets as a reserve.

- - Minor increase in area size.

- Exploration rewards vendor moved to explorer areas on outpost. Deletes the one in Research wall. Also rearranges spawnpoints for explorers on the surface.

- Add medical access to field medic section at Main Outpost FA Station.

- Add Mining redemption vendor. Resolves #28

- Moves lights in several places to not be in the same spot as cameras.

- Fixes APCs at Xenoresearch being turned off as well as access into the sub-department. Also removes exploration vendor.

- Internal second button added in engine room for going in and out of the SMES room.

- Mech Bay shutter name fix. Was labelled Mining Storage.

- Fixes blindspots for cameras.

- Railings for hangar bays for safety reasons.

- Door access fixes.

- - Remove access restrictions on FA Stations.

- - Fix access for Red Armoury preventing HOS entry.

- - Fix access for surface teleporter room preventing RD entry.

- Gives Armoury what it had for Northern Star.

- Dorm additions and tweaks.

- - Space dorms on deck 1 added so everyone doesn't have to go straight to the surface for private fun.

- - Locks added to heads' bedrooms on deck 3.

- - Moves an antag thingy out of the way to the west side of deck 1.

- Increases main power SMES energy amount.

- Remove extra AI Status Display Monitor in QM Office.
2019-12-31 19:22:13 -05:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Atermonera
eeb8310aa2 Fixes mech projectile armor thinking test projectiles are dangerous 2019-12-21 23:58:07 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00