Commit Graph

28015 Commits

Author SHA1 Message Date
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
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
Spades
d0cc1bfc36 Merge pull request #2066 from Cameron653/MULTIPLE_EXTEND_VOTES_HAVE_NO_USE_IN_THE_GAME_AND_CAN_GO_TO_HELL
Prevents multiple extend votes.
2017-08-28 19:53:36 -04:00
Cameron653
3adaac4d91 Update autotransfer.dm 2017-08-28 17:09:41 -04:00
Cameron653
fa780f8f71 Update autotransfer.dm 2017-08-28 17:09:06 -04:00
Ketrai
7055489f58 Fixes more indentation errors
T_T
2017-08-28 22:56:57 +02:00
Ketrai
c2dd08a0c8 Welcome to the mess that's my copy and paste 2017-08-28 22:41:34 +02: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
Ketrai
b6a288fcf4 Adds 4 new crates for 4 new monkey cubes
Basically the same as the pull I did a moment ago.
2017-08-28 21:33:42 +02:00
Cameron653
45edf4cb02 Update autotransfer.dm 2017-08-27 19:42:59 -04:00
Cameron653
d896a030f8 Adds global announcemment 2017-08-27 19:31:23 -04: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
Spades
4eeabfc657 TRAVIS STOP 2017-08-27 02:23:39 -04:00
Spades
229431bd4d Oh sure you compile fine but Travis cries 2017-08-27 01:49:41 -04:00
killer653
55a9cf7de9 Correct way. 2017-08-26 22:50:11 -04:00
Cameron653
db875f67ec Update autotransfer.dm 2017-08-26 22:39:25 -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
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
105cd5e37a Merge pull request #2046 from Ketrai/master
Updated stolen supplies
2017-08-25 01:23:27 -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
Verkister
20e2b78963 Proper shutdown for borgo refreshing. 2017-08-24 15:56:52 +03:00
Verkister
1d266509ae Auto-updates for vore panel and borgo gut UI.
-Vore panel now automatically refreshes when belly contents enter or leave.
-Updates only happen when the panel is open.
-Should also work from the prey's perspective.
-Borgo sleeper UI also does that now.
-Clicking the borgo gut while active toggles the UI updates.
-Hacky shit lmao but I need to pass out again like 2 hours ago so goodnight.
2017-08-24 02:46:57 +03:00
Ketrai
4546f5cc9a Updated contraband crate
Added the contraband you can get from trash piles, re-added phazon pieces.
2017-08-22 23:00:43 +02:00
Ketrai
20250d76e1 Updated stolen supplies
Removes the majority of phazon pieces. (getting the full set has an extremely tiny number of succeeding, and you can't get the circuit board anyways. I kept one so people know it still exists.) Adds high tier contraband you can find in trash piles to give an alternative way to obtain these. Hopefully encourages more people to mine to get points and resources for science. If you feel this isn't balanced enough, can always increase the probability of getting cosmetic or lesser items to dilute the pool.
2017-08-22 13:13:57 +02:00
Cyantime
007dc9c5d9 Reduces mice per pile from 2 to 1. 2017-08-20 21:42:00 -04:00
killer653
eb48f05509 Adds Xenneth custom ID 2017-08-20 21:28:16 -04:00
Cyantime
70a03f1155 No one saw that. 2017-08-16 19:20:57 -04:00