Commit Graph

28109 Commits

Author SHA1 Message Date
Spades
c8f716bd2d Lore tweaks 2017-09-01 23:41:08 -04:00
Spades
c1645841df Merge pull request #2087 from Yoshax/cya
Removes whitelist requirements from Daemon and Enochian
2017-09-01 07:09:02 -04:00
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
Yoshax
19c047a4ae Removes whitelist requirements from Daemon and Enochian 2017-08-31 22:33:31 +01: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
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
Anewbe
0c89df05f6 Should make prometheans playable 2017-08-27 14:24:47 -05:00
Anewbe
e365fc5a3f Merge pull request #3726 from Woodratt/WR_Floortile_stuff
Woodrat breaks everything with floor decals
2017-08-27 15:13:20 -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