Commit Graph

1662 Commits

Author SHA1 Message Date
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
OrbisAnima
24ceb65752 Port: Metamorphic Glasses (#4428)
* Port: Metamorphic Glasses

Basically, this just adds the old style glasses to the code without
removing anything.

https://imgur.com/eeqjW7c

Glasses can be found in the bar vendor, or can be ordered with the
bar/party supplies like any other glasses.

* Port: Metamorphic Glasses - Fix

Removed the relative path. Tested
2017-12-11 00:52:20 -06:00
Anewbe
ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06:00
Mechoid
820b41575d Adds Mining Drones and a fabricator for them. Hooray amending commits, also. (#4413) 2017-12-07 17:32:26 -06:00
Belsima
0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Neerti
c26b26aed4 Merge pull request #4374 from Anewbe/cargo_clotting
Makes the clotting cargo crate more expensive
2017-12-01 12:29:12 -05:00
Neerti
af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
# Conflicts:
#	code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Anewbe
7d43b9f91d Makes the clotting cargo crate more expensive 2017-11-29 20:05:18 -06:00
Cyantime
2c31da4064 Oxygen Generator improvements 2017-11-28 22:05:28 -05:00
Anewbe
d524d721b9 Merge pull request #4335 from Neerti/11/22/2017_explorer_gear
Adds Exploration Equipment
2017-11-25 14:39:12 -06:00
Neerti
8ac2100fa2 Adds Exploration Equipment
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
Anewbe
6e3bbd31c0 Removes the mosin-nagant, moves the sprites 2017-11-22 01:14:14 -06:00
Neerti
9db34eae86 Adds Hunting Rounds
Adds a system for projectiles to inflict additional damage on specific kinds of simple animals.
Adds special bullets for certain rifles which are very effective against 'animal' SAs such as giant spiders, bears, carp, and such. The bullets do less damage to other targets such as humanoids.
Replaces the southern cross gun locker regular ammo with hunting ammo.
2017-11-19 23:59:17 -05:00
Neerti
4263a9b70b Makes Syndie Toolboxes Special Again
The syndie toolboxes have been split into two versions, one with the old contents pre-powertools and one with the current powertools. Both are in the uplink, however only the regular tool version of the syndie toolbox can be found in maint now. This is to make power tools less commom, as there are several spots where syndie toolboxes are guaranteed to spawn at,  and it made the CE's tools less special.
2017-11-18 08:06:38 -05:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
mistyLuminescence
0431c2d23c Changes the old hyposprays to the new hyposprays. (#4223)
* Hypospray mk1 -> Hypospray mk2

* Medical random spawns no longer have the new hypo.

* Medic syndiecrate now has the old hypo
2017-11-15 16:31:50 -06:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
mistyLuminescence
5a05a51904 Adjusts streamlined (Vey-Med) med voidsuits 2017-11-07 21:58:13 +00:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217)
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
2017-11-05 22:53:11 -06:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Anewbe
6dfea97220 Merge pull request #4166 from Neerti/10/26/2017_shields
Adds New Advanced Shields, Tweaks
2017-10-27 20:38:27 -05:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Belsima
24a36295e3 Gives EMTs the appropriate EMT jacket. 2017-10-27 11:20:27 -04:00
Belsima
75b94df650 Gives T-Ray scanner to CE and Atmos. 2017-10-27 11:17:40 -04:00
Neerti
446927fa21 Adds New Advanced Shields, Tweaks 2017-10-26 20:55:13 -04:00