Belsima
e61efc752a
more gammers ( #4052 )
...
* Update medsci.dm
* Update miscellaneous.dm
* Update arcade.dm
* Update transform.dm
* Update implanter.dm
* Update shuttle_console.dm
2017-10-13 23:32:22 -05:00
Neerti
0e57b66f6a
Adds an Esword subtype that wrecks synthetics.
...
Ports /tg/'s esword and double esword sprites, both item and inhands.
Hivebot isSynthetic() now returns true.
2017-10-13 02:17:27 -04:00
Neerti
7cafd7d239
Merge pull request #4002 from Anewbe/outfits
...
Ports Bay's outfit system
2017-10-11 22:00:45 -04:00
Anewbe
1f9a14ffd7
Adds Skeletons for background use
2017-10-06 20:40:12 -05:00
Anewbe
ccd90031fa
Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci
...
Science Dufflebag
2017-10-06 10:51:05 -05:00
MisterLayne
8aed98be14
Adds science dufflebag
2017-10-05 16:26:56 -04:00
Anewbe
66837464d2
Implanters should have an icon again
2017-10-04 23:07:59 -05:00
Anewbe
82f24079f4
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits
...
# Conflicts:
# code/game/jobs/job/assistant.dm
# code/game/jobs/job/civilian.dm
# code/modules/admin/admin_verbs.dm
2017-10-04 20:08:55 -05:00
Anewbe
10b0264c6a
Yet more work on the Outfit System
2017-10-04 20:05:20 -05:00
Neerti
4db89d42f5
Merge pull request #4014 from Anewbe/drone_permits
...
Drone permits can now be worn
2017-10-04 20:59:29 -04:00
Anewbe
2fde466a21
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits
2017-10-03 23:24:12 -05:00
Anewbe
b393bb897d
Repaths permits as accessories
2017-10-03 00:04:58 -05:00
Anewbe
bf6c9ba4b8
Drone permits can now be worn
2017-10-02 23:14:14 -05:00
Anewbe
5e635aff46
Adds a hacky method to put loadout implants in the user's antag records. Fixes a runtime.
2017-10-02 00:11:27 -05:00
Anewbe
46e411f80f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant
2017-10-01 21:52:36 -05:00
Anewbe
d0a22df9c3
Continues work on outfits
2017-10-01 20:50:30 -05:00
Anewbe
e82ea2d599
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix
...
# Conflicts:
# icons/obj/items.dmi
2017-10-01 13:13:13 -05:00
Anewbe
1b7ecf6789
Ports Bay's outfit system
2017-10-01 02:31:37 -05:00
Anewbe
969aa45e9a
Switches 2 for DEAD
2017-09-29 12:07:16 -05:00
Anewbe
7c5d7c4d75
Improves tracking implant code, adds a tracking implant variant to the loadout
2017-09-28 20:25:46 -05:00
Anewbe
dffb3a6fef
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scythe
...
# Conflicts:
# icons/obj/weapons.dmi
2017-09-28 16:07:45 -05:00
Anewbe
ef1749009a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix
...
# Conflicts:
# icons/obj/items.dmi
2017-09-28 15:56:53 -05:00
Neerti
d4dd908f94
Merge pull request #3962 from Anewbe/gravestone
...
Adds grave markers
2017-09-28 16:22:46 -04:00
Anewbe
7a13c8136f
Finishing touches on gravemarkers
2017-09-27 18:59:26 -05:00
Neerti
853d8e80f1
Merge pull request #3914 from Anewbe/bone_fixer
...
Adds the bone clamp, and some alien surgery tools
2017-09-27 19:06:32 -04:00
Neerti
ab76e6d612
Merge pull request #3958 from Anewbe/legcuffs
...
Changes Legcuff sprites
2017-09-27 19:05:32 -04:00
Anewbe
eed312a8fb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone
...
# Conflicts:
# icons/obj/structures.dmi
2017-09-27 13:49:56 -05:00
Anewbe
73ddd22296
Implanter tweaks
2017-09-27 11:59:59 -05:00
Anewbe
47f2854bb7
Makes the scythe a child of fireaxes, adds it to the weed control crate
2017-09-26 22:15:33 -05:00
Anewbe
280f3010f8
Adds grave markers
2017-09-26 21:03:34 -05:00
Anewbe
a4dd5056b0
Changes Legcuff sprites
2017-09-26 05:48:59 -05:00
Anewbe
caa4fecd8b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer
...
# Conflicts:
# icons/obj/abductor.dmi
2017-09-25 20:35:19 -05:00
Woodratt
9f806e2f67
Syndicate ID changes
...
- Added a Syndicate ID with all access (admin spawn only).
- Port of 'Syndicate id cards now listen for owner destruction' from Bay. Link https://github.com/Baystation12/Baystation12/pull/11563
2017-09-25 17:01:55 -07:00
Neerti
20ea71934c
Merge pull request #3919 from Anewbe/tech_shifting
...
Shifts around a few Tech Levels.
2017-09-24 00:09:02 -04:00
Neerti
6bd197f5f8
Merge pull request #3895 from Anewbe/interdimensional_cable
...
Adds an endless cable coil to the alien toolbelt
2017-09-24 00:07:00 -04:00
Neerti
ba8b8d194c
Merge pull request #3912 from Anewbe/spider_briefcase
...
Adds a spider spawner grenade, and variant.
2017-09-24 00:05:26 -04:00
Anewbe
915264f98b
Merge pull request #3821 from Cameron653/LEGCUFF_FUNCTIONALITY
...
Makes legcuffs work once more.
2017-09-23 17:04:06 -05:00
Anewbe
c57e55d08c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into spider_briefcase
...
# Conflicts:
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-09-23 14:40:21 -05:00
Anewbe
a66072fcf2
Shifts around a few Tech Levels.
2017-09-23 12:54:04 -05:00
Anewbe
b47b1ce1f1
Adds the bone clamp, and some alien surgery tools
2017-09-22 20:45:00 -05:00
Neerti
ad3a4ab6b2
Merge pull request #3899 from Anewbe/surgery_toolspeed
...
Better borg tools, improves Electric Welder
2017-09-22 19:49:49 -04:00
Anewbe
dd177bc96a
Adds a spider spawner grenade, and variant.
2017-09-22 17:23:21 -05:00
Anewbe
c80b535a29
Merge pull request #3902 from Neerti/9/19/2017_lost_drone
...
Adds the Lost Drone
2017-09-22 15:24:05 -05:00
Anewbe
40075a319a
Merge pull request #3806 from ghost/woodbuck
...
Adds wooden buckets, craftable with botany.
2017-09-22 12:20:29 -05:00
Neerti
52c2eaac69
Placates Travis
2017-09-22 01:45:48 -04:00
Neerti
afd7b15442
Adds the Lost Drone
2017-09-22 01:17:53 -04:00
Anewbe
0b83e020af
Better borg tools, improves Electric Welder
2017-09-20 21:48:15 -05:00
Anewbe
69e9906d75
Adds an endless cable coil to the alien toolbelt
2017-09-20 00:26:41 -05:00
Belsima
e94e375cd5
Adds nicotine to cigarettes. ( #3856 )
...
* Adds nicotine to cigarettes.
* Fixes pathing.
* Adjusts the volume of nicotine added.
* satisfies the lord travis
* Better way of adding nicotine to cigs.
2017-09-18 11:02:51 -05:00
Cameron653
00d61422d3
H.gloves -> H.shoes
2017-09-12 21:46:56 -04:00