Commit Graph

25813 Commits

Author SHA1 Message Date
Arokha Sieyes
b4c0d6f7b5 Merge pull request #946 from Screemonster/particleguns
adds a zero-pressure gun for mining
2017-02-14 19:17:06 -05:00
Arokha Sieyes
ed0d3ca378 Merge pull request #949 from Yoshax/secbalance
Security non-lethal balance changes
2017-02-14 18:40:03 -05:00
Arokha Sieyes
ca4f27a516 Merge pull request #952 from JoanRisu/Fluff_Items_worshop
Driving into town!
2017-02-14 18:39:15 -05:00
Arokha Sieyes
8c92926848 Opened doors on shuttle, more zone_console tweaks 2017-02-14 18:05:18 -05:00
Anewbe
12a6ad40b2 Merge pull request #2995 from Screemonster/crateqol
QoL on abandoned crate puzzle
2017-02-14 17:00:35 -06:00
Anewbe
fae79a7f80 Merge pull request #2996 from MagmaRam/gunshow
Lock-on changes
2017-02-14 17:00:28 -06:00
Anewbe
95a670e562 Merge pull request #2994 from Leshana/backpack-drag-issue
Fixes dragging items with storage onto an occupied hand
2017-02-14 17:00:05 -06:00
Yoshax
cad3a04113 Merge branch 'master' of https://github.com/VOREStation/VOREStation into secbalance 2017-02-14 22:03:26 +00:00
Arokha Sieyes
9988477f42 Final work on belt mining 2017-02-14 16:36:34 -05:00
Screemonster
ce28b35275 Adds Krak-B-Gone, a silicate spray for fixing windows 2017-02-14 18:29:55 +00:00
JoanRisu
356aee9dda Name change to car 2017-02-15 01:32:58 +09:00
JoanRisu
28b7b1622c Adds the Humvee into the game with basic features for playtesting! 2017-02-15 01:09:34 +09:00
Arokha Sieyes
ff6790b174 Console percentage and sizing fixed but not button
Dunno why button dun work
2017-02-14 01:02:07 -05:00
JoanRisu
3a0ebd78b1 Here comes the HUMVEEEEEEEEE 2017-02-14 12:44:56 +09:00
Arokha Sieyes
3df9a4f7e6 Merge branch 'roguelike' of https://github.com/VOREStation/VOREStation into roguelike 2017-02-13 22:09:12 -05:00
Arokha Sieyes
c3d0349531 Scoring fix, overlays fix, map tweaks to v7 2017-02-13 22:08:42 -05:00
Leshana
7ebe3fc6d2 Added preliminary skeleton for zone control console, and timeout. 2017-02-13 21:57:41 -05:00
Arokha Sieyes
c47a2cae13 List defines 2017-02-13 21:08:17 -05:00
Arokha Sieyes
70fc3c5af7 Scoring and cleanup 2017-02-13 21:05:38 -05:00
Arokha Sieyes
85fbc527a3 Nearing playtest time 2017-02-13 20:24:54 -05:00
Yoshax
3162c723d9 Security non-lethal balance 2017-02-13 15:49:35 +00:00
Arokha Sieyes
41169628da MORE progress. 2017-02-13 01:20:51 -05:00
Screemonster
a6b00c8870 adds a zero-pressure gun for mining 2017-02-13 03:48:24 +00:00
Arokha Sieyes
9817d67461 More initial codework on rogue miner. 2017-02-12 21:04:31 -05:00
Screemonster
a7ae4fd4ab bugfix in anti-tamper proc 2017-02-13 01:42:33 +00:00
Kelshark
868ddbea61 More shipping - trading things and map updates 2017-02-12 14:19:43 -05:00
Arokha Sieyes
6d364b9f9e Beginning of rogue mining zone 2017-02-12 01:29:06 -05:00
Kelshark
5b6c8aeab6 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/clothing/under/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	config/custom_items.txt
2017-02-12 00:32:26 -05:00
Kelshark
435c1027d8 Proof of concept shipping API 2017-02-12 00:29:57 -05:00
Arokha Sieyes
f77239909d Framework for new shuttle
Sprites and floor tiles and whatnot.
2017-02-11 21:55:37 -05:00
Arokha Sieyes
497bda4df6 Consolidate shuttle files + define mining one
It was getting junky the way I was doing it.
2017-02-11 21:55:02 -05:00
MagmaRam
db5e832e28 Lock-on time is now 2.5 seconds. 2017-02-11 20:05:22 -06:00
Kelshark
91c21833a5 thingie 2017-02-11 17:17:43 -05:00
Arokha Sieyes
b3ebee2d2f Merge Yosh's R&D map changes 2017-02-11 00:26:26 -05:00
Arokha Sieyes
75e94253ed CC Map Tweaks & 2 New Shuttles
Okay, the administration shuttle isn't new, I just made it more comprehensive.

-Made it easier to create multi-destination shuttles for player-use when not antags. The existing ones were pretty geared towards the Mercenary game mode. Now it's pretty easy to make a shuttle that goes a bunch of places.

-Redesigned admin shuttle (pac-man shaped one at CC) to be multi-destination shuttle more capable of supporting RP. Can be used on 'hard' away missions by putting in the appropriate area in the away mission (`/area/shuttle/administration/away_mission`). Or, hell, include it on every new away mission and say that it's the E-Z mode version of that mission.

-Added new AwayMission shuttle to Dock 1. By default it can only go between the station and the old abandoned construction site, but if it detects that there's a map loaded with the appropriate area (`/area/shuttle/awaymission/away`), then it will be available for travel to that destination as well, listed as "Unknown Location". The shape of the area should be 13 wide x 5 tall. The shuttle opens to the right, in the center of the 5.

-Redid several parts of Centcom. Nothing too huge. Mostly made some hallways less barren, allowed access to the trams area on the right by default for shift-end people to use the trams, tweaked a couple of hallways to make sense (going through the bridge to get to a security checkpoint?) and added a couple more potted plants for good measure. Mostly added windows because several hallways were just... like... I feel like I'm underground.

-Changes on z1: Added away shuttle to dock.
-Changes on z2: Lots, see above.
-Changes on z4: Add area for Away Mission shuttle.
2017-02-10 23:45:59 -05:00
Anewbe
2eaf2c6ebb Merge pull request #2993 from VOREStation/strref-fix
Re-fix for #2312
2017-02-09 21:24:52 -06:00
Anewbe
cb0e1d784a Merge pull request #2992 from VOREStation/langlist
Updates adv scanner known_implants
2017-02-09 21:24:17 -06:00
Anewbe
c1008b52cd Merge pull request #2989 from MagmaRam/sandwich
Meat Meat Meat Meat Meat Meat and Fork Sandwich
2017-02-09 21:24:03 -06:00
Spades
b6cfefaea4 Merge pull request #936 from VOREStation/runtime
Runtime eats mice
2017-02-09 21:25:24 -05:00
Screemonster
deb867215a QoL on abandoned crate puzzle 2017-02-10 00:14:10 +00:00
Leshana
283b58e93d Fixes dragging clothing with storage onto an occupied hand
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that.  So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied.   Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00
Arokha Sieyes
d786da6b7d New alt-titles for HoP and Janitor
* "Deputy Director" for HoP
* "Maid" for Janitor

Fixes #924
2017-02-08 16:52:09 -05:00
Arokha Sieyes
b307d9a90e Runtime eats mice
Fixes #417
2017-02-08 16:37:50 -05:00
Arokha Sieyes
e027118e73 Merge pull request #931 from VOREStation/wingcolor
Sounds add for #205
2017-02-08 16:23:30 -05:00
Arokha Sieyes
95a41466c7 Merge pull request #932 from VOREStation/humancolor
Gives humans a default color
2017-02-08 16:23:21 -05:00
Arokha Sieyes
6d0610d716 Merge pull request #933 from VOREStation/lightmsg
Remove floor light toggle broadcast
2017-02-08 16:23:13 -05:00
Arokha Sieyes
76dd877183 Merge pull request #934 from VOREStation/holiday
Add vore day to holidays
2017-02-08 16:23:04 -05:00
Arokha Sieyes
c266f8a9e4 Adds vore day 2017-02-08 16:06:39 -05:00
Arokha Sieyes
4b40405834 Teshari nudity permit fix
Fixes #420
2017-02-08 16:03:50 -05:00
Arokha Sieyes
d868f70567 Remove floor light toggle broadcast
Fixes #440
2017-02-08 15:13:59 -05:00