Commit Graph

28130 Commits

Author SHA1 Message Date
killer653
2164d34e83 The result of coding tired 2017-08-11 22:46:12 -04:00
Cameron653
d040f9e9c0 Removes 1 time selection 2017-08-11 20:04:22 -04:00
Spades
c46c63efe1 Merge pull request #1978 from Verkister/blehh2sparkbooger
Attempt to fix dual/ear color DNA issues.
2017-08-11 18:41:24 -04:00
Spades
f3dbef9f0c Merge pull request #1979 from VOREStation/solgov-lore-fixes
Icon fixes for UNSC stuff
2017-08-11 18:41:05 -04:00
Verkister
44d4a540e2 Some improved contrast on some markings plus a new ear option. 2017-08-11 21:16:47 +03:00
Verkister
da358da075 updoots 2017-08-11 20:13:01 +03:00
Verkister
979d9e5a35 Merge branch 'master' of https://github.com/VOREStation/VOREStation into blehh2sparkbooger
# Conflicts:
#	code/game/dna/dna2.dm
2017-08-11 20:07:36 +03:00
Verkister
27fd245b9f Attempt to fix dual/ear color DNA issues.
-Mostly slipped lines between already existing vorestation edits in these files.
-Should probably fix the DNA related issues with dual color tails and ear colors.
-Such as resleeving breaking the forementioned on characters.
-Basically just added ear and secondary tail color definitions to the DNA codes.
-Untested though as I have no idea how to even test this in solo.
2017-08-11 20:03:06 +03:00
Belsima
dcf9628b0d aliens don't get paid as much 2017-08-11 12:19:28 -04:00
Spades
4af3ba0a34 One more thing 2017-08-11 01:21:38 -04:00
Spades
77a7dc1761 Fixes broken icons for some things
dunno if I fixed the olive and tan suits tho
2017-08-11 00:47:07 -04:00
Spades
c34c9888bd Merge pull request #1974 from Cameron653/METEOR_EXPLOSION
Makes Meteors Less Powerful
2017-08-10 23:23:40 -04:00
Cameron653
07ad3e9f81 Merge pull request #1973 from Cameron653/YOU_KEEP_GIVING_ME_RUNTIMES
Removes redspace tech from sizegun
2017-08-10 22:18:28 -04:00
killer653
2f18b90d04 Decreases the explosion of meteors by a lot.
It put phoron in the entire fuckin station!
2017-08-10 21:22:38 -04:00
killer653
e11cd75353 Fixes runtimes from sizegun tech 2017-08-10 20:29:40 -04:00
Spades
c8f16aa2b6 Merge pull request #1972 from VOREStation/solgov-lore-fixes
Return of the UNSC
2017-08-10 19:55:33 -04:00
Spades
836b00b4e1 Merge pull request #1971 from Cameron653/VERY_COMPLEX_WINGS_THAT_REQUIRE_LOTS_OF_TIME_AND_EFFORT_TO_GET_WORKING_WHY_ARE_YOU_STILL_READING_THIS_(EAT_JASMINE)
Makes wings their own seperate entity on char setup
2017-08-10 19:55:09 -04:00
Spades
67642e26d5 Merge pull request #1969 from Cameron653/DHAEL_CRUSH_CODE
Micro Crush Adjustments
2017-08-10 19:54:53 -04:00
killer653
5b28d69ca6 Invisible Spawn Bug Fix 2017-08-10 19:34:21 -04:00
killer653
0aaaa3139b Splits some fluff wings up. More adjustments. 2017-08-10 19:23:24 -04:00
Spades
31146ec22f inconsistent indentation fixed 2017-08-10 18:59:13 -04:00
Spades
42e3b650d2 oh right and we have a new superpower faction 2017-08-10 18:44:38 -04:00
killer653
f31c811c82 Adds Roiz's fat Lizard Tail 2017-08-10 18:27:38 -04:00
Spades
152d6f82ed travis it's commented out stop whining 2017-08-10 16:18:08 -04:00
Belsima
cb7b9ca64e please don't get mad at me github 2017-08-10 16:12:29 -04:00
Belsima
d4e3b4453d A load of Teshari stuff: For Real This time 2017-08-10 16:12:16 -04:00
Belsima
31f9127cf9 Adds Grayson Manufactories FBPs. 2017-08-10 14:38:33 -04:00
Spades
fe7ba8036d Return of the UNSC
- Overwrote SolGov lore.
- Removed mentions of SifGuard.
- Confederate is now just Central because Confederacy is a stupid type
of government for something with decent cohesion on the galactic stage.
- Stuff I'm not done with
- I'm fucking tired
- Zzzzzzzzzzzzzzzz
2017-08-10 14:22:26 -04:00
killer653
a2f346df0f Makes wings their own seperate entity on char setup 2017-08-10 07:12:22 -04:00
Spades
e7a4fbcba0 Fixes energy sniper back sprites not appearing 2017-08-10 06:45:24 -04:00
Spades
9ca5b07da0 Might as well fix shotgun clip icons too 2017-08-10 06:39:49 -04:00
Spades
6c3ce37a67 Merge pull request #1970 from Cameron653/SIZEGUN_DESC
Sizegun desc update
2017-08-10 05:38:06 -04:00
PrismaticGynoid
b5ccfbd328 Also allows people to take their wheelchairs with them instead of leaving them behind, and fixes a runtime with wheelchair users who are missing hands or arms. 2017-08-09 21:27:28 -07:00
killer653
72740edb26 Sizegun description
Updates sizegun description
2017-08-09 22:19:45 -04:00
killer653
056d30fd83 HOLY FUCKING SHIT
SOUND THE SIRENS
MASSIVE BUGFIX
2017-08-09 21:09:55 -04:00
Spades
d2661263e0 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into gun-stuff 2017-08-09 21:06:40 -04:00
Spades
90c55d64da Description changes
- Fixed descriptions lacking what rounds a gun uses.
- Made some descriptions have better grammar.
- Made some descriptions have more interesting fluff.
- AS-24 auto shotgun no longer has a unique description not copied
almost word for word from the assault rifle.
2017-08-09 21:06:29 -04:00
Spades
6b02206adf Sniper Changes and Fixes
- Fixes the heavy sniper hand sprite so it no longer looks like a
pistol. Not ideal, but better.
- Changes energy sniper to use the Z8's hand sprite, because it's more
distinct than looking the same as the laser carbine.
- Adds the SVD back by request of Woodrat. It's not spawnable yet, since
I don't know where you want to balance it.
2017-08-09 21:04:58 -04:00
killer653
06975fca7a More micro step changes!
- Increases max end damage by being stepped on
- Decreases low end damage by being stepped on
- Spreads damage across all body parts
- Gurantees damage will heal over time, provided they were only stepped
on one.
- Puts Dhael in a boot (wait, did this change really?)
2017-08-09 20:46:54 -04:00
Spades
9a39219a55 Merge pull request #1967 from Cameron653/QUICK_NIF_FIX_
Gives admins with R_ADMIN their quicknif verb
2017-08-09 18:40:24 -04:00
killer653
2e153d876a Gives admins with R_ADMIN their quicknif verb 2017-08-09 17:43:54 -04:00
Spades
6fcd1fb3ce Merge pull request #1962 from Cameron653/BORG_BELLIES
Allows for borg/pai stomachs to be correctly examined.
2017-08-09 15:17:13 -04:00
Spades
929cfa93cf Merge pull request #1963 from Cameron653/SIZEGUN_LASER
Sizegun Tweak.
2017-08-09 15:15:42 -04:00
killer653
8dbe4b7a8e Allows size laser to be used on all mob/living
Want to make a mob catgirl big? Go for it.
Want to make a PAI big? Go for it.
2017-08-09 10:31:01 -04:00
killer653
6dd38b5661 Adds examine_vr for borgs 2017-08-09 10:28:58 -04:00
killer653
88c9510701 One too many indents 2017-08-09 10:22:50 -04:00
killer653
4cf8c22fc6 Why not PAIs? 2017-08-09 10:21:17 -04:00
killer653
c0a7b43e73 Fixes examine stomachs on borgs 2017-08-09 10:15:18 -04:00
killer653
d80dea4bdd Red 2017-08-09 09:59:39 -04:00
killer653
f31d1735e2 Makes 50% difference able to be picked up 2017-08-09 09:57:51 -04:00