Commit Graph

17854 Commits

Author SHA1 Message Date
Spades
b8cfee22a9 Merge pull request #2085 from Verkister/synthpaintjurbs
Enables markings system on synth body parts.
2017-09-01 07:08:51 -04:00
Spades
689db71720 Merge pull request #2084 from Funce/log-spam-fix
Reduces log spam from simple_animals
2017-09-01 07:08:34 -04:00
Spades
327a9c7f76 Update custom_permits_vr.dm 2017-09-01 06:50:03 -04:00
Spades
5a0a3665f9 Map changes
- Because mice spawn from trash piles, they no longer exist on the map.
- Added some vents in places that were neglected.
- Added extra trash pit access.
- Added weapon permits to HoS office.
- Changed permits to match Polaris's simpler permits.
- Removed expired permits.
- Removed expired weapons.
- Fixed escape pod base turfs.
- Removed all remaining shatterproof windows.
- Fixed redundant window types.
2017-08-31 22:13:31 -04:00
Verkister
a3196a060c Enables markings system on synth body parts. 2017-08-31 15:40:34 +03:00
Funce
82edbe511c Reduces log spam from simple_animals 2017-08-31 14:30:21 +12:00
Spades
a19a4e2549 This should be anchored...
Direct pull because ssshhhhh no one sees me.
2017-08-30 17:40:26 -04:00
Spades
7cbba90932 Merge pull request #2080 from Funce/elevator-door-emag-fix
Emagging lift doors should no longer be a thing
2017-08-29 23:30:00 -04:00
Funce
87a68e40d8 Emagging lift doors should no longer be a thing 2017-08-30 13:54:45 +12:00
Cameron653
a77c6d76eb Update custom_items_vr.dm 2017-08-29 18:36:08 -04:00
killer653
1d7d778431 Ckey check 2017-08-29 17:28:59 -04:00
killer653
c5ae135759 Kitchi injector fix 2017-08-29 17:28:43 -04:00
killer653
90d38cefb2 Ketrai fluff adjustments 2017-08-29 16:44:22 -04:00
Spades
4812374d56 Merge pull request #2076 from AaronSherwood117/master
Adds Handshakes and Head Patting
2017-08-29 14:37:08 -04:00
Spades
cc75893ba2 Merge pull request #2073 from Cameron653/master
Late August Polaris Sync
2017-08-29 13:54:55 -04:00
Aaron Sherwood
507bd3e708 Add Headpats and Handshakes
Thanks to Cameron for helping get this working. Been way too long since
I started trying to learn DM.

Target either hand or the head on help intent (with an empty hand) and
you can now perform classic human greetings and/or pet people!
2017-08-29 05:40:00 -05:00
Spades
7ca531181b Merge pull request #2075 from Funce/dev/borg-assorted-fixes
Medical Borgs Assorted Fixes
2017-08-29 04:13:20 -04:00
Spades
7b9ca07b12 Merge pull request #2074 from Funce/dev/ooc-notes-fix
Finally fixes borg OOC prefs (WOOOT)
2017-08-29 04:12:53 -04:00
Funce
c0d28be09f Changes comments to be more find-friendly 2017-08-29 19:10:27 +12:00
Funce
292f045733 Changes Comment to be more Find-friendly 2017-08-29 19:06:05 +12:00
Funce
13d64875ff Finally fixes borg OOC prefs 2017-08-29 14:41:10 +12:00
Funce
b329860e50 Adds crew monitor to medihound 2017-08-29 14:38:20 +12:00
Funce
bf259427ca Fixes medical borgs being unusable 2017-08-29 14:37:50 +12:00
killer653
e2ea7951d3 Teshari stuff was added to Polaris. 2017-08-28 21:22:05 -04:00
killer653
923e6a9677 Fixes compile errors. 2017-08-28 21:04:53 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Spades
cab238199f Merge pull request #2070 from Ketrai/master
Adds 4 new crates for the 4 primal races
2017-08-28 20:43:14 -04:00
Ketrai
a627e5053e fixes indentation
Lessons learnt, frijnnghh
2017-08-28 22:41:01 +02:00
Ketrai
15d978ba1c indentation is evil
Beware of copy-pasting code fuck
2017-08-28 22:39:32 +02:00
Ketrai
bcccf8e6f8 attempts fixing primal cubes again 2017-08-28 22:34:36 +02:00
Ketrai
f03b7a3e38 Fixes snack_vr dm for primal additions 2017-08-28 22:17:56 +02:00
Ketrai
8c0b06fc39 Adds the cubes themselves for the monkeys
as the titles says
2017-08-28 21:38:55 +02:00
Ketrai
035ce3a7a6 adds primal boxes
yada yada adds those 4 monkeys in boxes
2017-08-28 21:37:21 +02:00
Anewbe
0c89df05f6 Should make prometheans playable 2017-08-27 14:24:47 -05:00
Verkister
bbc2a5cf9b More backup backup checks to maybe finally make sure only on-turf objects may fall down
Onsite edit because fuck this. I had it fixed and working before.
NO BAD Z-HOLE. NO EATING SHIT OFF HANDS AND FOLKS YOU BAD. ONLY FLOOR FOOD FOR YOU
2017-08-27 16:18:40 +03:00
Spades
ebf19958a3 Merge pull request #2064 from Cameron653/KETRAI_CUSTOM_ITEM
Ketrai custom item
2017-08-27 03:36:42 -04:00
Cameron653
3b5648282d Update custom_items_vr.dm 2017-08-26 20:02:25 -04:00
Cameron653
4d8d327284 Update custom_items_vr.dm 2017-08-26 19:48:10 -04:00
Cameron653
63cc4489b1 Update custom_items_vr.dm 2017-08-26 19:33:55 -04:00
Cameron653
0db9b961ec Update custom_items_vr.dm 2017-08-26 19:20:00 -04:00
Spades
df37726669 Merge remote-tracking branch 'refs/remotes/origin/master' into oties-and-wild-removed 2017-08-26 15:51:47 -04:00
Spades
18ffeefafd Removies oties and outdoors area 2017-08-26 15:51:37 -04:00
MisterLayne
0a232698b1 Fixes the problem with the solar control computers where they were not fixable if they were destroyed and the glass was removed. 2017-08-25 16:42:57 -04:00
Verkister
73f450465f Makes vore organ transfer use the target organ's sound.
-Ye it's no longer hardlimited to squish2.ogg
2017-08-25 16:04:01 +03:00
Spades
cc6e0ce96b Merge pull request #2058 from VOREStation/WING_DESIGNER_FIX
Should fix designer tails being unselectable.
2017-08-25 01:24:21 -04:00
Spades
668078ed08 Merge pull request #2054 from Verkister/spampanels
Auto-updates for vore panel and borgo gut UI.
2017-08-25 01:24:10 -04:00
Spades
26d52b576a Merge pull request #2026 from Gearshy/master
Shock collars now come with exciting shocking action!
2017-08-25 01:23:11 -04:00
Spades
a43c1d408c Merge pull request #2037 from Cameron653/master
Adds Xenneth custom ID.
2017-08-25 01:23:01 -04:00
Cameron653
947b38a7f1 Should fix the wings 2017-08-24 22:43:55 -04:00
Verkister
f846437db5 I think I figured out the shuttle issue.
-No, the line 84 did not replace or relate to the timer part you commented out.
-Due to condition mismatch of some sort, the code skipped the line 84 stuff, moving onto the next thing below, slapping the shuttle through instantly because of the timer having been commented out
2017-08-24 21:23:39 +03:00