Arokha Sieyes
4da16802cf
Merge pull request #1003 from Screemonster/moreparticleguns
...
adds more particle guns and icon fixes
2017-02-22 09:42:39 -05:00
Screemonster
e55fc09540
adds more particle guns and icon fixes
2017-02-22 10:59:34 +00:00
Cameron653
43f9f33a44
Merge pull request #1000 from Cameron653/master
...
Tempest saddlebags , saddle bags adjustments
2017-02-21 21:14:42 -05:00
Arokha Sieyes
7ee45aedd8
Merge pull request #998 from VOREStation/reslvfix
...
Extra ways to get backup implants
2017-02-21 21:03:34 -05:00
Arokha Sieyes
cfd0db5a97
Merge pull request #999 from Yoshax/voxvoxvox
...
Fixes loadout stuff
2017-02-21 21:02:43 -05:00
killer653
63ae45159d
Tempest item, saddle adjustments
2017-02-21 20:55:09 -05:00
Yoshax
a07033fd15
Fixes loadout stuff
2017-02-22 01:08:58 +00:00
Arokha Sieyes
77ada345d7
Extra ways to get backup implants
...
Adds them to medical vendors (by the box) and producable by an autolathe (by the single)
2017-02-21 19:01:48 -05:00
Arokha Sieyes
d08071ab7e
Merge pull request #996 from VOREStation/reslvfix
...
Further fixes
2017-02-21 14:25:19 -05:00
Arokha Sieyes
dd733371bc
Further fixes
...
Apparently the weight prefs were accidentally removed (this also fixes size prefs when spawning), fixes size when resleeving, renames char setup options to be more explanatory
2017-02-21 14:15:59 -05:00
Yoshax
c31100f134
Adds Vox loadout stuff
2017-02-21 14:54:16 +00:00
Arokha Sieyes
7c0775aff3
Vore bellies across resleeving
...
Listen, it's SUPER HARD to code when you've got a fever and it's 3:30am. So for now you just get your own vore bellies. To code it so that you get the OTHER PERSON'S vore bellies will have to wait a bit.
2017-02-21 03:24:30 -05:00
Arokha Sieyes
493be12110
Merge pull request #984 from VOREStation/resleeving
...
Resleeving Stuff
2017-02-20 18:14:06 -05:00
Arokha Sieyes
c8cc0ffb3d
Merge pull request #980 from Yoshax/foodfood
...
Custom food stuff
2017-02-20 18:12:31 -05:00
Arokha Sieyes
a6ed469aca
Finishing touches
...
Make mind records get removed when you cryo.
Added resleeving manual.
Commit virgo-7 because mapmerge constantly says it has changes. BeyondCompare says there aren't any. Probably some formatting change but it'll probably do it for everyone until I do it.
Move where backup implants are (put them in resleeving room)
Only Posibrains are indigestible. MMIs are. Squishy brainmeat!
Unrelated icon change to station announcements by admins.
2017-02-19 20:46:55 -05:00
Leshana
d4771b3544
Fix number of wire spools in vulpine belt and add to custom_items.txt
2017-02-19 18:40:29 -05:00
Arokha Sieyes
260a7fa686
Prevent printing restricted/whitelisted species
2017-02-19 18:25:56 -05:00
Arokha Sieyes
5b257f55e3
Make OOC notes persistant
...
Even when logged out, or body swapped, or new bodies are printed.
2017-02-19 17:48:17 -05:00
Leshana
ca425ce968
Added code to allow adding more steel or glass to the synth body printer.
2017-02-19 17:34:50 -05:00
Arokha Sieyes
bdfc9be908
Locks printed bodies properly, and shows if they are locked records on console
2017-02-19 16:29:10 -05:00
Leshana
978b982fa2
Added options for starting with scan or resleeving lock to the player setup panel.
2017-02-19 16:26:59 -05:00
Arokha Sieyes
c3cd4600b7
Lockable body scans in charsetup
2017-02-19 15:23:23 -05:00
Leshana
6262973afe
Made resleeving machines constructable by adding circuits and designs.
2017-02-19 15:18:34 -05:00
Arokha Sieyes
b9d84565f1
Typo fix, adds more confused
2017-02-19 04:14:40 -05:00
Arokha Sieyes
a9e5262ce7
Synthetic body printer, limbs/organs respected
2017-02-19 04:05:14 -05:00
Arokha Sieyes
74018ebd34
Basically replaced biological cloning so far
2017-02-19 00:01:14 -05:00
Yoshax
dad4e19785
Does custom food stuff
2017-02-19 01:02:12 +00: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
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
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
