Commit Graph

1514 Commits

Author SHA1 Message Date
Verkister
45cf4a5d43 Missed file addition. 2017-07-07 18:30:03 +03:00
Verkister
6a633f6c51 More otie stuff.
-Took out the minimum oxygen requirement from space oties. They all died outside as oxygen was not one of the gases there.
-Moved guard otie to security category in cargo.
-Moved the collared otie from pred crate to its own crate. Bare one is still in the pred crate chances.
-
2017-07-07 17:07:15 +03:00
Spades
08704251b2 Merge pull request #1793 from VOREStation/guns
Dakka Dakka
2017-07-02 02:29:46 -04:00
Spades
36f32b1ab6 Merge pull request #1756 from Verkister/cargoandborgo
Cargo and borgo stuffs. [change check a whole week overdue!]
2017-07-02 02:20:25 -04:00
Spades
2f9c8b48b4 Merge remote-tracking branch 'refs/remotes/origin/master' into guns 2017-07-02 00:30:23 -04:00
Spades
3db35eb684 Dakka Dakka
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -04:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Anewbe
2dd8f33ecd Merge pull request #3543 from Neerti/6/24/2017_aooc_for_nonadmins
Adds AOOC functionality for antags.
2017-06-25 16:34:15 -05:00
Anewbe
12be304ba4 Merge pull request #3528 from VOREStation/aro-pol-defibs
Ports Bay/Paradise Defibs
2017-06-25 16:15:01 -05:00
Neerti
1cfd2f08f2 Adds AOOC functionality for antags.
AOOC can be granted on a per-antag type basis.  If the type has can_use_aooc equal to true, they can both use and see AOOC.  It is true by default to allow for the upcoming Infiltrator type to automatically be able to use it.
The types disallowed from AOOC are ERT, Traders, and Renegades.  This means admins can now use AOOC to talk to the real antags and not the ERT.
2017-06-24 12:31:18 -04:00
Spades
21889e4991 One more because I forgot to click save 2017-06-20 01:15:12 -04:00
Spades
be2a99ca32 Some ammo fixes
- Fixes pirate gun not getting 12g caliber correctly.
- Fixes .357 caliber not being named consistently with everything else.
(Do not merge this until
https://github.com/PolarisSS13/Polaris/pull/3533 is merged pls, unless
Yosh fixes his caliber to be correct also.)
- Changes .50AE ammo to .44 because that's more consistent with what the
gun is capable of in-game, because it uses the same damage values as the
.357 and not a bullet that shoots through through your fridge, through
your house, and hits your neighbor's home invader like a .50AE is IRL.
The fact that it's .44 makes much more sense. This is purely a fluff
change because it annoyed me.
- Fixes a bunch of ammo.dmi icon names and makes the file not a jumbled
fucking mess. This means now your 762 mags and the newly renamed 44 mags
will not be broken anymore.
2017-06-19 23:44:01 -04:00
Verkister
978363021f Retry for the cargo and borgo stuffs.
-Added Eggnerd limb design disk to the mail order pack.
-Added the non-security oties on the pred crate picklist.
-Added mail order guard puppy crate. (the frankensteinian voremobcode+followerpetcode+beepskycode combowombo)
-Attempts a workaround for janihound belly not bulging from people. (I swear it was working before the merged code cleanup :v)
-Janihound sprites centered properly.
-Made remains(mouse skeletons etc.) edible again.
2017-06-18 04:01:14 +03:00
Arokha Sieyes
39ce8cfe27 Merge pull request #1738 from VOREStation/polaris-sync-20170614
Polaris Sync 2017.06.14
2017-06-15 19:12:01 -04:00
Leshana
93318a5345 Fixes players not being removed from the manifest immediately when cryoing.
* The cryopod simply qdel's the datacore records. Old garbage.dm hard-del()'d datums, so it was fine.  Now we need to make sure they are actually removed from the data_core.
* Testing shows this fixes #1713 and in most cases the objects also GC cleanly.  However some older computers still retain hard references to data_core entries. But even in the cases where that prevents a clean GC, the player is still removed from the manifest successfully and promptly, so that can wait.
2017-06-15 17:19:52 -04:00
Leshana
780eb637d8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170614
# Conflicts:
#	code/controllers/shuttle_controller.dm
#	code/modules/shuttles/shuttles_multi.dm
2017-06-14 17:54:34 -04:00
Arokha Sieyes
fad93cf366 Ports Bay/Paradise Defibs
I like the ones I wrote, but these are proooobably better.

They have normal units, which are worn on the back and you can grab the paddles out of to shock people.
Then there's compact units, which are worn as a belt, and serve the same purpose.
And finally there's the combat units, which allow revives through spacesuits, and have no safety so you can zap living people on harm intent (good for antags? CMO?).

These appropriately check for blood, a heart, etc. So, in that way, they're a bit more realisic than my original ones which I was sorta lazy in writing.
Emagging them turns off the safeties, allowing them to zap people who are still alive.

I actually cleaned up their sprite choice code a little and added a sprite for the 'combat' one since previously it was just the emagged sprite (flashing exclamation point). Now it's just got a red heart monitor, and the emagged ones keeps the exclamation.

Did make one balance change in that compact ones use twice the power (inefficient small capacitors? or something?).
2017-06-12 14:51:39 -04:00
Yoshax
d8c61d5708 Comments out Burst Laser crate because tis a silly weapon 2017-06-12 03:13:00 +01:00
Leshana
c4c5dc098a Fix runtimes in radiation controller
* Fixes Baystation12/Baystation12/issues/17443 - Runtime in radiation.dm,30: illegal: sqrt(-2.857143)
  * Updating radiation power to below zero should simply delete the source.
* Fixes at least one cause of Runtime in radiation.dm,41: Cannot read null.z in an effort to fix Baystation12/Baystation12/issues/17411
2017-06-11 20:50:13 -04:00
Leshana
5a02b7e5c7 More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-10 22:41:51 -04:00
Leshana
ae4458e4ae Update radiation system for the new garbage collector. 2017-06-10 22:41:51 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
Leshana
e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
Leshana
d4ebcac3f6 Update radiation system for the new garbage collector. 2017-06-05 22:10:07 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -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
Leshana
8315abb352 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 07:56:09 -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
0af77012c4 Merge pull request #3465 from Yoshax/radiation
Ports radiation rework and stuff from Bay
2017-05-31 18:37:58 -05: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
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
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Leshana
34c73dab69 Optimization/Rewrite of Radiation Controller
* The performance of the radiation controller as-is was not fast enough for inclusion in production servers, but it has some nice featuers, so rewrote it to be more performant.
* Instead of storing the radiation strength for every turf, we only store the sources of radiation, and calculate the strength only for mobs who might be in range.
   * Old method was ray-tracing to every turf in range whether anything was there to be irradiated or not.  Could be hundreds of turfs.  New method only lazily calcualtes strength at a turf if we actually need to know it.   Often times this is zero turfs if nobody is standing in engineering.
  * Removed the automatic processing of objects with "rad_power" set.  Objects are responsible for calling the repository to create/update their radiation sources.   Saves some extra overhead that in practice was redundant with other process controllers.
  * Also tweaked to be more respectful of qdel'd objects and added some comments.
2017-05-25 18:43:56 -04:00
Leshana
e16a3f4b3d Updated crew monitor computer to support multi-z output and nanomaps. 2017-05-22 16:15:47 -04:00
Ben Reeve
6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01:00
Yoshax
12a269b503 Adds craftable autoinjector to the autolathe 2017-05-22 02:14:01 +01:00
MagmaRam
2a42f9ef55 Merge pull request #3405 from Anewbe/bullet_swap
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-21 13:17:58 -05:00
Leshana
0f593fe087 Updated crew monitor computer to support multi-z output and nanomaps. 2017-05-17 00:59:10 -04:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Anewbe
903a2a2e5f Fixes a few things, adds 556 clips 2017-05-12 18:03:49 -05:00
Arokha Sieyes
0a33bd5234 More tweaks to new head guns 2017-05-09 11:08:48 -04:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Anewbe
3b82b75f83 Merge pull request #3396 from Cerebulon/skirtsuits
Adds 24 new skirt versions of suit sprites.
2017-05-05 21:55:14 -05:00
Anewbe
2c42583d1b Merge pull request #3416 from Bromuzl/Undershirt-corrections
Undershirt corrections
2017-05-05 20:15:42 -05:00
Bromuzl
ef678994f7 Adding missing shirts to Undershirt, minor cleanup
Two of the button-down shirts were not referenced in the undershirt datum, removed one previously accidentally added twice.
2017-05-05 05:05:56 -05:00
Anewbe
393dec4e2b Merge pull request #3408 from Yoshax/floralsomatoray
Adds Gene Targetting mode to Floral Somatoray
2017-05-03 14:50:18 -05:00
Datraen
3d442044d1 Adds Gene Targetting mode to Floral Somatoray
While I was rooting around in hydroponics code, I saw that a list was being regenerated with UI interaction, so I threw the list into the plant controller.

No proper sprites for the Floral Somatoray's new mode yet, but it uses the gun sprite from mutate mode, and the projectile sprite from yield mode.
2017-05-03 13:33:58 +01:00