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
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
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
Yoshax
12a269b503
Adds craftable autoinjector to the autolathe
2017-05-22 02:14:01 +01: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
Anewbe
58b9c63ec2
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-01 20:25:43 -05:00
Arokha Sieyes
2ed665cbd0
Autolathe card creation
2017-04-06 18:00:18 -04:00
Leshana
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
1ea5252f5d
Merge pull request #3181 from VOREStation/vplk-pipelayer
...
Modernize the automatic pipe layer
2017-04-01 15:59:05 -05:00
Anewbe
72adee8fb8
Adds a bunch of things to cargo
2017-03-31 00:23:27 -05:00
Leshana
ab4c63791a
Modernize the automatic pipe layer
...
* Upgrades the automatic pipe layer to modernize its code a bit towards latest standards and fixing various bugs.
* Make it constructable so it can acutally be used by someone!
2017-03-30 18:13:37 -04:00
Arokha Sieyes
387f429e5e
Merge large polaris changes
2017-03-02 22:44:17 -05:00
Anewbe
8875c5ce1f
Merge pull request #3027 from VOREStation/implanters
...
Make implanters able to be created
2017-02-28 20:26:48 -06:00
Arokha Sieyes
50a8b94294
Make implanters able to be created
...
Under 'medical' in the autolathe. 1 sheet metal, 1 sheet glass (syringes were 2 sheets total so just keeping with that).
2017-02-28 16:25:55 -05:00
Leshana
3781494933
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2017-02-23 18:25:37 -05:00
Leshana
dbd3622588
Enhances the Paper Shredder
...
* Makes the paper shredder constructable and deconstructable.
* Switches to some new sprites which are animated!
* Machine now requires power, icons respond to power on/off etc.
2017-02-21 19:21:32 -05:00
killer653
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
Dhaeleena
2fef35d980
Lots of changes and Fluff fixes
2017-01-26 11:48:22 -03:00
Anewbe
ac4b355f5e
Surgical tools will no longer cause damage on help intent
2017-01-21 18:34:05 -06:00
Yoshax
7e453226dc
Rehauls some autolathe code
2016-07-24 22:02:58 +01:00
