Commit Graph

27077 Commits

Author SHA1 Message Date
Arokha Sieyes
a9088d2306 Merge pull request #1606 from PontifexMinimus/patch-2
One more jobslot for librarians.
2017-06-03 00:45:12 -04:00
Arokha Sieyes
d63303f136 Merge pull request #1609 from VOREStation/polaris-sync-2017-06-01
Polaris sync 2017 06 01
2017-06-03 00:43:51 -04:00
Leshana
de30b00c9e Fixed damaged and burnt plating icons.
* We are using eris sprites, which have a shared overlay for broken/burnt between all tile types.
2017-06-02 13:39:44 -04:00
Leshana
56268171d4 Fix issues with radiation controller on multi-z maps.
Radiation sources are by design z-level specific, the ray trace check needs to respect this.
2017-06-02 12:46:03 -04:00
Leshana
c4bdc4c027 Updated VOREStation specific files for the ammo path reorganization.
* Updated paths in dm files
* Updated references in all dmm files for tether, virgo, and randomz
2017-06-02 12:18:13 -04:00
Verkister
8af7fe67be Verk's synthfluff stuff for possible easylazy approval. (#1600)
* Adds the Rahboop synth limb set. Also fixes the white stray pixel in ponytail 6 hair.

* combined rahboop tail to the groin component I have no idea whether the loose tail icon would've showed up at all :v

* fixed slight pixel offset in left side limbs.

* more pixel adjustment smh

* an attempt.

* Figured out the tail stuff.

* Fuck it. Sharing is caring.
2017-06-02 09:08:38 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
9dfc65b628 Merge pull request #3491 from Neerti/6/1/2017_mech_stumping
Makes Mechs Fall
2017-06-01 14:44:36 -05:00
Anewbe
da437e50ee Merge pull request #3485 from Neerti/5/31/2017_make_surgery_slightly_better_again
Surgery Modifications
2017-06-01 14:42:38 -05:00
PontifexMinimus
b88deb8b00 One more jobslot for librarians.
Request of Benemuel.
2017-06-01 21:29:34 +02:00
PontifexMinimus
44b3822d8a Adds Test Subject alt-title to assistants. (#1605)
* Update assistant.dm

* vorestation edit note

* Update assistant.dm
2017-06-01 15:16:33 -04:00
Neerti
b5802fb185 Makes Mechs Fall
Mechs now will fall when crossing an open tile.
Anything below that tile will have a bad day.
Also makes lighting overlays unable to fall just incase.
2017-06-01 15:05:51 -04:00
Neerti
962cabe72c Merge pull request #3487 from Anewbe/deathalarm
Fixes Death Alarms
2017-05-31 22:54:52 -04:00
Anewbe
9d8f4cfa53 Fixes Death Alarms 2017-05-31 19:38:07 -05:00
Anewbe
0af77012c4 Merge pull request #3465 from Yoshax/radiation
Ports radiation rework and stuff from Bay
2017-05-31 18:37:58 -05:00
Anewbe
491ae6ac9b Merge pull request #3475 from SpadesNeil/aces-gun-stuff
Path naming of ammo to be consistent, and also fixes some gun things
2017-05-31 18:11:25 -05:00
Anewbe
5de9e5f453 Merge pull request #3483 from Yoshax/fix
Drop pod issue fix
2017-05-31 17:51:48 -05:00
Arokha Sieyes
6ada64082b Adds Trash Piles
Replaces some lockers and racks in maintenance with trash piles. They are presistent loot piles for people who just can't help but greytide. It allows people who join later in the shift to still get goodies. Each is searchable once per shift by each ckey.

They have three loot lists: alpha, beta, and gamma.

Alpha has the highest chance and just random maint stuff. All usable items (no random empty beer cans) but nothing you couldn't find elsewhere.
Beta has a lower chance of spawning and is usually contraband, mechaically useful stuff. Radio jammers and the like.
Gamma is dangerous or highly illegal contraband, and is unique. Guns (nonlethal!), teleporters, syndicate IDs, etc.

Gamma items have special handling: all of the trash piles share a gamma list, and when an item is given out from the gamma list to someone, it's de-pooled so that another trash pile won't hand it out. The pile-collective maintains a reference to it as an 'allocated' gamma item though. Then, when the gamma list runs out, it reviews allocated gamma items to find any that it might be able to 're'-distribute. Namely ones that have been deleted, or are in cryopod computers because the user left with them. It can then hand that item out again. If it cannot hand out a new gamma item, it gives beta instead.

You can also just manually put gamma-list items back into the piles if you're leaving. Or, if you find a translocator, but already made yourself one in R&D (or later make one), or you're the RD and find a bluespace harpoon, you can stuff the translocator/whatever back into any trash pile and it'll be re-pooled into all of them. You can only return gamma items this way, not beta/alpha.

Additionally, if you find yourself playing a simple animal mob for an event (or you're a mouse), you can hide in trash piles by clicking them. There's a 50% chance you're revealed if the pile is searched. You can climb out by clicking the pile again. I dunno if that'll ever get used but it was easy to code, so eh.
2017-05-31 18:36:00 -04:00
Neerti
a0a390e887 Surgery Modifications
Semi-rewrites how surgery failure works.  Using an improper surface will call the surgery step's fail proc instead of just doing a melee attack.
Adds 'surgery odds' var to objs, which determines effectiveness.  The numbers for operating tables/roller beds/tables remain unchanged from the previous version, however doing it this way makes it cleaner to add new surfaces in the future.
Adds a proc to get a surgery surface.
Also makes burn repair on FBPs more efficent, so that one scorched robot does not take literally all of robotic's wires.
2017-05-31 17:41:02 -04:00
Neerti
1f70e65160 Merge pull request #3484 from VOREStation/aro-pol-footblood
Please let the blood go away
2017-05-31 10:49:11 -04:00
Arokha Sieyes
7e5df22516 Merge pull request #1594 from VOREStation/aro-footblood
Please let the blood go away
2017-05-30 17:11:21 -04:00
Arokha Sieyes
af0f5ee8fa Merge pull request #1593 from VOREStation/aro-arofluff
A Jacket To Match The Coat
2017-05-30 17:11:00 -04:00
Arokha Sieyes
a2090ae90a Merge pull request #1592 from VOREStation/aro-cratefix
Fix lesser predator crate
2017-05-30 17:10:40 -04:00
Arokha Sieyes
ece202d777 Merge pull request #1591 from VOREStation/aro-SPECIES
Properly hide traits already selected
2017-05-30 17:08:22 -04:00
Arokha Sieyes
64ff8bed08 Please let the blood go away
You can't qdel lists.
2017-05-30 16:27:04 -04:00
Arokha Sieyes
67dce8524b Please let the blood go away
You can't qdel lists.
2017-05-30 16:25:55 -04:00
Arokha Sieyes
4913464913 A Jacket To Match The Coat
And normal holster instead of leg holster. Because I can never decide what I want.
2017-05-30 15:50:23 -04:00
Arokha Sieyes
7ffc3a3960 Fix lesser predator crate
Had the same path as the more expensive one, so the firstly defined one would be overridden and not show up.
2017-05-30 15:13:50 -04:00
Arokha Sieyes
a8a668b7b3 Make cancel work on trait list 2017-05-30 15:12:04 -04:00
Arokha Sieyes
a94887af27 Properly hide traits already selected 2017-05-30 14:47:39 -04:00
Leshana
2c8df87899 Tweak to Radiation Optimization
* Optimized garbage collection of radiation sources until we get qdel() hints.
* Made the RADIATION_LOWER_LIMIT configurable (option for people to save some cpu time)
* Added some comments and broke the proccessor into separate procs for profiling purposes
* Added a changelog.
2017-05-30 13:55:53 -04:00
Arokha Sieyes
271084e22c Merge pull request #1586 from VOREStation/aro-SPECIES
Trait Tweaks
2017-05-30 11:48:58 -04:00
Arokha Sieyes
d6cb4590dd Tweak spacing on setup, fix DNA bug 2017-05-30 11:39:12 -04:00
Arokha Sieyes
684f570d0d Trait Tweaks
Adds blood color as a custom species setting
Adds photoresistant trait
Changes haste and slowdown traits to be taj and tesh speeds
2017-05-30 11:35:40 -04:00
Yoshax
ef2883ff7e Drop pod issue fix 2017-05-30 16:32:40 +01:00
Layla Crosse/Occula Drenn
6d4e0695f9 Fixing Ariana's taurhalf 2017-05-30 00:37:03 -04:00
Arokha Sieyes
dfa560d06b Allow 5 traits
`balance intensifies`
2017-05-29 23:29:32 -04:00
Layla Crosse/Occula Drenn
559c01b439 Ariana's Centipede Taurhalf. (#1585)
* Adds Ariana Centipede taur

* Add files via upload

* Adding Ariana's taurhalf.

UPLOADING THE RIGHT FILE THIS TIME.

* Adding Ariana's Centipede taur

Please.   Please I'm going insane.

* Adding Ariana's taurhalf

I want death.
2017-05-29 21:13:53 -04:00
Anewbe
a412b5063b Merge pull request #3423 from Belsima/ftm
Lets biological females have facial hair.
2017-05-29 18:31:18 -05:00
Arokha Sieyes
5ccb939531 Merge pull request #1583 from VOREStation/aro-SPECIES
Custom Species Trait System
2017-05-29 17:49:45 -04:00
Arokha Sieyes
d9c845a298 Don't sanitize out Custom Species unless they are changing species 2017-05-29 17:19:03 -04:00
Arokha Sieyes
1c153f7063 Merge pull request #1582 from killer653/master
Gives Vorrakul a mouse plushie
2017-05-29 14:17:02 -04:00
Anewbe
119f80e06a Merge pull request #3476 from VOREStation/aro-goggles
Goggles are airtight
2017-05-29 13:13:52 -05:00
Anewbe
1633c32c99 Merge pull request #3478 from Bromuzl/Bromuzl-High-topsLoadout
High-tops loadout
2017-05-29 13:11:57 -05:00
killer653
9316d49972 Gives Vorrakul a mouse plushie
Resolves #1576
2017-05-29 13:20:31 -04:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
killer653
d2fa930662 Returns one 2017-05-28 23:55:23 -04:00
killer653
a52bac9f1c Makes it so mice can't eat people.
http://i.imgur.com/Huc8Ikk.jpg
It was causing a lot of bugs
2017-05-28 18:48:20 -04:00
Neerti
dc4d14bf2a Merge pull request #3474 from VOREStation/vplk-sundry-runtimes
Sundry Runtime Fixes
2017-05-28 17:44:04 -04:00
Spades
3a0bdf5cf9 Name tweak for Anewbe 2017-05-27 16:31:17 -04:00