JoanRisu
3785bd3700
~Changes flag for squirrelkin language
...
~changes Joan's bag and its icon
+Adds Dhael's gun and permit to her spawnlist
~debug attempt on Crescent Rose's sprite changing code. Also changes sprites.
2017-03-03 03:39:00 -08:00
Screemonster
89a0559077
Add's vinjj's fancy bandana
2017-03-03 11:33:02 +00:00
Poojawa
7891bf2b52
Trek Uniforms
2017-03-03 02:51:05 -06:00
JoanRisu
ceca64804d
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop
2017-03-02 23:28:45 -08:00
JoanRisu
3f26a1d223
Some personal changes to my items and adds a dune buggy for science expeditions.
2017-03-02 23:17:04 -08:00
Poojawa
1375db16bc
fixes typos
2017-03-02 15:06:48 -06:00
Poojawa
c062a0cfe1
trek uniforms + loadout listing
2017-03-02 12:00:19 -06:00
Dhaeleena
7712aabda9
Permit for cat gun
2017-03-01 19:58:33 -03:00
RadiantFlash7
576dcfb07a
Map work&compiling fix
...
Mad work 2.0, +fixed compile issue with Icon_state in custom clothes.dmi
2017-02-28 23:51:21 -05:00
Screemonster
b1908e65db
fun meme, but OP now invisible things actually work
2017-02-28 08:57:22 +00:00
izac112
20a87dfbd2
Path cleanup and some sprite and fluff updates
2017-02-27 20:19:42 +01:00
Screemonster
ef7e20c16a
Adds nerdglasses
2017-02-27 01:51:19 +00:00
Arokha Sieyes
69097464ee
Fix Tempest's Saddlebags, redo how Saddlebags Work
...
In the title!
2017-02-23 19:20:51 -05:00
Screemonster
5e47eaf7fe
fixes battlerifle and unsc shotgun worn sprites
2017-02-22 21:28:04 +00:00
Arokha Sieyes
5b72365c48
Merge pull request #1006 from VOREStation/fluffstuff
...
More fluff changes
2017-02-22 10:31:57 -05:00
Arokha Sieyes
deeee616d1
More fluff changes
...
Some day I'll decide exactly what I want. That day probably isn't today, either.
2017-02-22 10:20:07 -05:00
killer653
63ae45159d
Tempest item, saddle adjustments
2017-02-21 20:55:09 -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
Kelshark
051b505e3c
Merge branch 'master' of https://github.com/Repede/YawnWiderStation
2017-02-19 12:12:17 -05:00
izac112
a408f5bc49
more flooooof and flooof update
2017-02-19 18:06:32 +01:00
Kelshark
8df7fcd10a
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# .gitignore
# vorestation.dme
2017-02-18 09:40:18 -05: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
Screemonster
a7ae4fd4ab
bugfix in anti-tamper proc
2017-02-13 01:42:33 +00: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
killer653
b055158c0a
Gives the hypospray a name
2017-02-07 18:01:06 -05:00
killer653
43a11821c5
Adds Tempest's syringe correctly
...
Fixes #897 correctly
2017-02-07 17:26:41 -05:00
Arokha Sieyes
a37e7067d1
Renames fluff vials
...
People were getting a little scared at "Aronai begins loading vial (poisoned) into the hypospray" when it was antitoxin. x3
2017-02-04 23:49:10 -05:00
Kelshark
9ce88c8c6c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/silicon/robot/robot_modules.dm
# config/custom_items.txt
# icons/obj/gun.dmi
# maps/virgo-1.dmm
# vorestation.dme
2017-02-03 21:35:22 -05:00
Arokha Sieyes
94b621b310
Merge pull request #893 from Cameron653/master
...
Polaris Feburary Syncs
2017-02-02 23:06:13 -05:00
Arokha Sieyes
380eee789d
Merge pull request #899 from VOREStation/suitnerf
...
Nerf teleport rig
2017-02-02 22:59:29 -05:00
Arokha Sieyes
03b6697d04
Nerf teleport rig
...
Reduces the armor to less than that of the EMT suit, removes integrated O2 tank.
2017-02-02 18:38:58 -05:00
Screemonster
f8c121cbb9
adds recoloured phazon sprite for the scuttlebug
2017-02-02 13:24:55 +00:00
killer653
277071532b
Item path fixes and edits
...
1. Oxygen tank has been changed from emergency_oxygen to
emergency/oxygen. Fixed this in custom clothings and the map
2. The vending_vr had some redundant things (repeating name, desc,
product ads, icon state, icon deny, contra.) and also the securivendor
code was causing problems since it's now been ported to polaris and is
accessable on all vending machines. Commented out the securivendor
vorestation logging.
2017-02-01 15:25:45 -05:00
Screemonster
f41ff655fc
fixes scree's suit modkit
2017-01-31 05:57:50 +00:00
Arokha Sieyes
49d5ce7052
Workaround for custom_item proc
...
It's incapable of spawning this belt, and apparently if I ready up before round start, it will spawn everyone who readies up in space for some reason? Orbis and I tested and aren't suuuper sure why. It's probably the belt though. So, easy solution is a box.
2017-01-30 16:47:31 -05:00
Arokha Sieyes
0008e89a5a
Merge pull request #881 from OrbisAnima/swimsuits2
...
Swimsuits for All! Fluff items for some
2017-01-30 12:38:52 -05:00
OrbisAnima
65e8ac37ab
Fluff Swimsuit minor adjustment
...
Description of Xsdew item was the wrong one, sorry!
2017-01-29 12:20:44 -03:00
OrbisAnima
5cb92eb078
Swimsuits for all!
...
-Added swimsuits to be picked in the loadout, without replacing the
uniform (They spawn in a capsule, a limited box that can only hold one
swimsuit, and only a swimsuit, and cannot be turned into cardboard.)
-Added Xsdew departamental selection of Swimsuits (Security, Medbay,
Science and Engineering)
-Added Xsdew Fluff Swimsuit!
Fixes #874
2017-01-29 11:26:32 -03:00
OrbisAnima
16a44b75bd
Swimsuits for All! Fluff items for some
...
-Added swimsuits to be picked in the loadout, since I created a special
container for them, they wont replace the uniform you spawn with. They
can be found in uniforms and suits!
-Added Xsdew departamental selection of swimsuits! (Security, Medbay,
Science and Engineering)
-Added Xsdew Fluff swimsuit!
2017-01-29 11:10:00 -03:00
Kelshark
69f700304c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
# maps/virgo-1.dmm
# maps/virgo-5.dmm
2017-01-28 00:15:12 -05:00
Dhaeleena
2fef35d980
Lots of changes and Fluff fixes
2017-01-26 11:48:22 -03:00
Arokha Sieyes
3abc27114c
Re-fix Verin?
2017-01-24 10:07:45 -05:00
Arokha Sieyes
45710ef8b3
Readds fed coat??
2017-01-24 10:06:06 -05:00
Arokha Sieyes
0af7ce8b5b
Icon, and removes old gun
2017-01-24 09:58:26 -05:00
Arokha Sieyes
860ce47074
All Aronai fluff change stuff except the icon
2017-01-24 09:58:18 -05:00
JoanRisu
8961a73ecb
Modern Federation Coats and Officer Caps
2017-01-24 01:13:41 +09:00
Kelshark
c57914a426
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/admin/verbs/adminhelp.dm
# maps/virgo-1.dmm
2017-01-21 01:42:11 -05:00
Spades
48c95efa2b
Merge pull request #849 from VOREStation/lcvend
...
Life crystal tweaks
2017-01-19 00:36:13 -05:00
Spades
d7c272bfa2
Merge pull request #851 from VOREStation/rigchange
...
Rig changes
2017-01-19 00:34:06 -05:00
Arokha Sieyes
c299c7ce22
Rig changes
...
Reduced armor further, removed stealth field. Paramedics probably don't need those.
2017-01-18 20:20:45 -05:00
