Commit Graph

1738 Commits

Author SHA1 Message Date
Neerti
7da5da69eb Tweaks Lead & Radiation Resistance 2018-02-12 07:10:26 -05:00
Aronai Sieyes
7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate
AwooCosplayCrate
2018-02-10 23:06:35 -06:00
mistyLuminescence
fa6ff94474 What's Yours Is Mined (#4556)
* Boom!

* Wires!
2018-02-09 18:56:46 -08:00
Silver
5bfca77f04 Proper Naming for VIRGO PR #3000
https://github.com/VOREStation/VOREStation/pull/3000

Adds Propernaming
Adds Contraband Variable
2018-02-08 17:43:23 -06:00
Silver
13b710fb61 Silver-ContrabandUpdate
Adds AwooCrate and MlemCrate to Contraband Supplypack. (These show up under 'supplies' in a hacked cargo console and are quite expensive)
2018-02-08 13:01:51 -06:00
Silver
ef4d87a352 AwooCosplayCrate
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
2018-02-08 12:57:18 -06:00
Aronai Sieyes
c0a7016d9a Merge branch 'master' into expgun2 2018-02-08 01:13:05 -05:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
Cyantime
d0f32b4a53 Adds frontier phaser to cargo 2018-02-06 21:58:08 -05:00
Leshana
95b9e67660 Ports callback datum from TG
* A callback datum system was created, a common framework that handles all of the nuts and bolts so anyone can implement callbacks easily without worrying about how to invoke procs.
* Adapted from tgstation/tgstation#22476 by MrStonedOne
2018-02-05 15:50:14 -05:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
mistyLuminescence
da4bd82a5d Adds more med gear to R&D and Cargo (#4691)
* Adds more med gear to R&D and Cargo

* standardises + adds sprites

* Removes cargo crate
2018-02-04 22:18:36 -06:00
Andromeda-K22
cee3066a41 RUST additions and updates, Modular guns, and Lead. (#4667)
* expanding rupture procs
adds hydromagnetic traps for power production.

* Minor tweaks.

* Adds modular guns using research components.

* Updates materials to have a radiation_resistance variable, used in calculating radiation. Adds Lead as a material.

* Un-zeros stock material radiation resistance.

* Adds, and enables four 'end-events' for the RUST in place of the old Rupture() proc.

* Map muckery?

* absolute pathing i guess?

* getting angry, travis.

* TRAVIS
STAHP

* I...
Comments? Lists? Who the hell knows.
2018-02-04 18:04:28 -06:00
Ketrai
93a9e6012d Makes the energy carbine crate consistent.
It made no damn sense to get 3 of them for the same price as the energy gun crate, which gives 2 energy guns, despite laser carbines being considered superior in some regards.
2018-02-04 14:20:03 +01:00
Leshana
df21594485 Ports callback datum from TG
* A callback datum system was created, a common framework that handles all of the nuts and bolts so anyone can implement callbacks easily without worrying about how to invoke procs.
* Adapted from tgstation/tgstation#22476 by MrStonedOne
2018-02-03 20:54:40 -05:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
Arokha Sieyes
17723b7df6 Cleans up references to assistant
Defines the USELESS_JOB value as "Visitor"
2018-01-31 00:55:13 -05:00
Aronai Sieyes
03319e4597 Merge pull request #2811 from Verkister/otiepoop
Otie fixes and tweaks plus another new variant.
2018-01-30 16:21:55 -05:00
KotetsuRedwood
32c4d3b10e Adds the latex maid dress to the restraints crate
Sqqqrrrkkk crrrllkrrrrk
2018-01-29 19:50:24 +00:00
Verkister
3a4d470604 disables pc grab growl while travis sucks legs over unrelated map bugs
some minor sprite tweaks

environmental disaster time

more things

bumps front and back rest sprites one p down

Some otie tweaks plus another new variant.
-Stops idle actions on player-controlled oties.
-Disables feeding autobarf (secdonut and rng) on player-controlled oties.
-Disables friending and auto standup on petting when player-controlled.
-Adds a tamed phoron otie with collar. (no ingame access yet so beg for mins)
-Tweaks the bare standing sprites a little. (one pixel shorter with even back stripes)
2018-01-29 09:02:48 +02:00
Arokha Sieyes
0b6e70402c STEALTH NERFSZZZZ - Removes rigs 2018-01-27 21:28:21 -05:00
Leshana
00d13c5832 Fix more Destroy / GC issues.
Fixes recursive Destroy call on containment field.
Fix unable to GC issue on air alarms.
Fix unable to GC issue on radiation sources.
2018-01-21 22:49:27 -05:00
Leshana
62e58702f7 VOREStation Tweaks to the Tesla engine
* Let you order the Tesla generator from cargo in case you need another one.
* Make the energy ball dissipate very fast if it escapes from confinement, limiting the number of machines it can blow up.
* Reduce devastation on machine destruction so areas are messed up but not just reduced to space.
2018-01-21 16:19:13 -05:00
Leshana
d7992a17f4 Fix GC issue on radiation sources. 2018-01-21 00:43:43 -05:00
Leshana
3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-01-19 17:52:25 -05:00
Leshana
db0ba60f64 Implements the Tesla engine and supporting features (#4539)
* Adds "typecache" utility functions. A fast way to filter lists by type.

Ported from TG

* Ports the "orbit" feature and subsystem from TG

* Adds a feature that allows mobs and objs to "orbit" around some atom.  They literally are moved around in circles.  See the `orbit` proc in orbit.dm.
* Adds a subsystem that processes the actual movement of orbiting items.

* Adds utility methods for common machinery behavior.

* Adds default_unfasten_wrench which handles the standard anchor/unanchor behavior of wrenches being used on machines.  Together with the other default_x_tool machinery procs we can eliminate having that code duplicated in dozens of places!
* Adds is_wire_tool proc to easily detect when a machine is hit with a tool that should open its wires UI (if it has one).

Based on ideas from Paradise, with improvements for us.

* Implements the Tesla Engine

Ported from a mixture of TG and Paradise code and assets: Edison's Bane

Includes the tesla energy ball itself, the generator that makes it, tesla coils, grounding rods, the circuits and frames to build them.

* Switch dusting to zapping on impact and spin better

Ported /tg SpinAnimation which supports more than triangles.
2018-01-19 14:56:08 -06:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Bromuzl
6a66b3d773 Correcting typo 556 - -> 545
The 5.45 machine gun ammo boxes were being named 5.56 because oops.
2018-01-15 01:49:18 -08:00
Anewbe
14f0060f28 Merge pull request #4531 from VOREStation/vplk-beam-upgrade
Ports the Paradise rewrite of TG rewrite of the Beam() proc
2018-01-14 14:59:46 -06:00
Neerti
96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527)
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
2018-01-14 14:58:15 -06:00
Spades
b441ccd6e3 9mm pistol updates (#4480)
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
2018-01-14 14:45:15 -06:00
Leshana
7e4b5901ec Ports the Paradise rewrite of TG rewrite of the Beam() proc
* New proc is more efficient and also supports:
- Multiple simultaneous beams from the same source.
- Doesn't block the thread while the beam is on.
2018-01-13 18:34:33 -05:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Arokha Sieyes
449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
MisterLayne
c993475f5a Adds more traitor items. 2018-01-09 16:23:11 -05:00
Leshana
807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
Arokha Sieyes
e43bdacf21 Redesigns the armory 2018-01-08 01:00:41 -05:00
Cyantime
af8cec54ab Fixes gravekeeper module wood synth, fixes typo in gravekeeper lawset (#4506)
* Fixes gravekeeper module wood synth, fixes typo

* Gives the grave gripper a name
2018-01-06 20:20:01 -06:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Neerti
9ab7c0bf0c Merge pull request #4470 from VOREStation/vplk-ss-machines
Convert machinery controller to StonedMC subsystem
2018-01-02 23:21:47 -05:00
Spades
581f175c27 Fixes shotgun speedloaders in Autolathe
The name was just wrong. Fixed it.
2018-01-01 17:54:49 -05:00
Leshana
a97a574278 Transformed the machinery processor into an StonedMC subsystem
* This is PHASE 1 of a multi-phase conversion.  In this first phase we implement the subsystem, but leave it processing the existing global list variables.  In the next phase we will switch to use datum variables in the subsystem.  The main reason for splitting into two phases is ease of code review; change the meaningful code without the hundreds of machines -> SSmachines.machinery substitutions.
* We did declare macros for adding/removing things to the processing lists, and convert everywhere to use the macros.
* Added var/is_processing to /datum to keep track of whether an instance is already in a processing list (prevents it being in the list twice!) and also debugging, making sure its not in two lists etc.
* NOTE: The global machines list is **no longer sorted** for performance reasons.  As far as I know, the only module that actually ever cared was cameras.   Our camera system already handles its own sorting in the cameranets anyway, so it should no longer be needed.
2017-12-29 15:31:59 -05:00
Leshana
66e9d9cfdf Unify datum var definitions
Inspired by https://github.com/tgstation/tgstation/pull/29636
Also consolidated some sideways overridden /datum/Delete() here to reduce proc-call overhead.
2017-12-29 14:23:13 -05:00
killer653
c45ffc9d35 ALL hunter ammo commented out 2017-12-23 21:40:56 -05:00
Cameron653
0ed12350fa Update contraband.dm 2017-12-23 15:54:15 -05:00
killer653
e88507b0fe Ace Edits 2017-12-23 13:09:22 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe
3b89c5e320 Merge pull request #4384 from Belsima/maid
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
Neerti
1066e14790 Merge pull request #4422 from Anewbe/utilities
Removes the military clothing from the loadout, repaths things
2017-12-12 20:16:33 -05:00