Commit Graph

8350 Commits

Author SHA1 Message Date
Razgriz
3009bade9e Remove sleeving cure
Removing resleeving sickness
2020-01-13 18:49:46 -07: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
6dcf1520b4 Let's get this wrapped up and ready to go.
Removed all KHI references, and the Vore AI Law stuff.
2020-01-13 19:38:10 +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
6b83f6010e Update RPD.dm 2020-01-12 00:35:04 -08: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
Holdelta
971926f195 Add files via upload 2020-01-11 23:29:43 -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
Sharkmare
f568be89d9 The cake, Serg event. (#120)
Adds items for an event, Made by Shadowfire117 and Ketrai
2020-01-11 00:20:57 +01:00
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93 Adds a single cure pill to vault, doubles amount ERT gets, changes taste 2020-01-10 09:31:51 +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
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
Heroman
9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10: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
Nadyr
d3cd4a6cde Merge pull request #66 from TheFurryFeline/TFF-Map_Fixes_Round_1
Mapfix Palooza Round One
2020-01-01 20:43:46 -05:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00: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
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
Razgriz
9656b7c18a Notification change for welderbombing
Instead of saying gaypwnd, it says you are doomed when welderbombing.
2019-12-29 14:25:49 -07:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Heroman
572112d28b Fixes AI not being able to resist out of nets 2019-12-29 08:33:10 +10:00
Repede
2af9f4ee44 Merge branch 'master' into master 2019-12-26 20:40:10 -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
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