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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
20ea71934c
Merge pull request #3919 from Anewbe/tech_shifting
...
Shifts around a few Tech Levels.
2017-09-24 00:09:02 -04:00
Neerti and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
killer653
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -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 and Anewbe
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
Cyantime
68056dd5f2
Deconflict
2017-09-16 19:00:30 -04:00
Cyantime
49a62057c3
Constructability.
2017-09-15 21:52:35 -04:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Cameron653 and GitHub
00d61422d3
H.gloves -> H.shoes
2017-09-12 21:46:56 -04:00
killer653
8b7c0576a5
Fixes legcuffs
2017-09-12 20:47:42 -04:00
Cameron653 and GitHub
d27e0092da
Adds the medical tape item
2017-09-12 14:52:38 -04:00
Anewbe and GitHub
605fd11705
Merge pull request #3807 from Cyantime/weldtank
...
Fixes lit welders not igniting fuel tanks.
2017-09-11 17:23:44 -04:00
Cyantime
26b53c0ea8
Fixes lit welders not igniting fuel tanks.
2017-09-09 17:25:37 -04:00
Belsima
eb341aaa65
Adds wooden buckets, craftable with botany.
2017-09-09 17:16:34 -04:00
Neerti
8f00965cc2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
...
# Conflicts fixed:
# code/modules/admin/topic.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/view_variables/helpers.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/transform_procs.dm
# maps/northern_star/polaris-1.dmm
# polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2
work
2017-09-04 21:52:47 -04:00
Spades
a55d4c5e4c
Imperial Military Update
...
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04:00
Funce
87a68e40d8
Emagging lift doors should no longer be a thing
2017-08-30 13:54:45 +12:00
killer653
cafac8efae
Polaris Sync
2017-08-28 20:52:11 -04:00
Andrew
4c133ba95d
Adds More Ways to Obtain Power Tools
...
- Added the hand drill and jaws of life to the protolathe
- Removed titanium from the hand drill and jaws of life
- Syndicate toolbox now comes with power tools
2017-08-25 20:15:09 -05:00
MagmaRam and GitHub
499f29354a
Merge pull request #3716 from Belsima/zipper
...
MORE ZIPPOS
2017-08-21 13:27:12 -06:00
Belsima
efac0c7e7b
fuck i didnt even code the zippos in
2017-08-15 23:59:14 -04:00
Anewbe and GitHub
ad4b439e96
Merge pull request #3680 from Neerti/8/4/2017_arrivals
...
Makes Arrivals Shuttle Great
2017-08-14 21:59:18 -04:00
Verkister
c72893c0f7
Noticed a case thing and i ain't taking chances this late.
...
-I'm already asleep it's not even me typing this shit right now.
2017-08-09 02:19:17 +03:00
Verkister
1b3732f11f
Another small saddlebag fix.
...
-Figured out why saddlebags weren't showing up on subtype taurs.
-Something something spaghrtti and now the iconstate sets accordingly to the main type name instead of subtype name.
-I really need to sleep this is my last second awake tonight and hopefully this works?
2017-08-09 02:12:12 +03:00
killer653
8e42ab0ca1
Merge remote-tracking branch 'PolarisSS13/master' into POL_SYNC
2017-08-08 16:10:47 -04:00
Anewbe