Kelshark
8df7fcd10a
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# .gitignore
# vorestation.dme
2017-02-18 09:40:18 -05:00
JoanRisu
2a56f27837
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop
2017-02-18 09:50:10 +09:00
Arokha Sieyes
8f417de9a3
This was always the only commit.
2017-02-17 00:56:53 -05:00
JoanRisu
399ef6390d
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop
2017-02-17 03:05:20 +09:00
JoanRisu
45888144e3
Fixes the key not being able to plug into the ignition.
2017-02-17 03:03:17 +09:00
Arokha Sieyes
1efad3d5b9
More guns + permit renewal
...
Adds 2.5 new guns (one isn't finished yet, it's got weird code so it's going to take a bit). They 'eat' the ammo they're loaded with and destroy the casings. So, if anyone wants caseless ammo, look at how I did it here.
Also renews my permit. Haven't done it IC yet, but I'll just delete it and the gun until I have. (Gosh if you can trust me to not just spawn random guns for myself you can trust me to do that :V)
2017-02-15 20:17:15 -05:00
Arokha Sieyes
eef3e32bdf
Merge pull request #959 from Screemonster/burninatingtheairlocksAGAIN
...
Fire now damages doors.
2017-02-15 18:13:32 -05:00
Arokha Sieyes
e60eb8464e
Additional mining tweaks on zone handling
...
Keep 2 zones clean instead of 1
Give 10 points for free, for progressing zones
Always score zones unless already scored, if asked to
Space geese are SPACE geese
2017-02-15 15:55:39 -05:00
Arokha Sieyes
ea275ad626
Fix typo, add playtest message.
2017-02-15 12:07:51 -05:00
Arokha Sieyes
69f0a222e5
More mining stuff
...
Adds binoculars to shuttle
Adds particle gun to shuttle
Adds paper on console with directions
2017-02-15 10:50:58 -05:00
Screemonster
924dcdb8cb
shutters immune, firelocks now equivalent to rwalls
2017-02-15 15:20:42 +00:00
Screemonster
922fe1db81
makes fire even greater than it was before
2017-02-15 03:56:09 +00:00
Yoshax
59796ae0e8
Adds flash magazines
2017-02-15 03:37:43 +00:00
Arokha Sieyes
c141e8b440
Merge pull request #954 from VOREStation/roguelike
...
Miner Minigame
2017-02-14 20:55:10 -05:00
Leshana
348d60ae62
Belter emergency shuttle recall and bugfixes.
...
* Various fixes with display on shutle console and detection of occupied zones etc.
* Remove a comment that buggy unit tests complain about, plus unused procs.
2017-02-14 20:45:02 -05:00
Arokha Sieyes
e4557b0724
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2017-02-14 20:29:57 -05:00
Arokha Sieyes
cb54ebb001
Merge pull request #945 from Screemonster/tamperbugfix
...
bugfix in anti-tamper proc & screesuit
2017-02-14 19:17:56 -05:00
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
