850155bfb7
Merge pull request #3167 from Anewbe/cigarette_sprites
...
Cigarettes and cigars have a "Burnt but not done" sprite
2017-03-30 19:37:27 -05:00
1d09caa08d
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into engineering_sprites
2017-03-29 06:24:06 +01:00
55fd0a2041
Adds hand sprites to many items in the engineering department
2017-03-29 04:09:33 +01:00
f91431fefa
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cigarette_sprites
2017-03-28 20:36:48 -05:00
826b7c5af0
Fixes a thing
2017-03-28 20:17:35 -05:00
2f976a22f8
Merge pull request #3158 from Anewbe/fbp_screams
...
FBPs should no longer scream when they collapse
2017-03-28 20:03:01 -05:00
33dffeb0b8
Merge pull request #2955 from Anewbe/heart_damage
...
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
c7e224b6e2
Merge pull request #3075 from Anewbe/armor_soak
...
Implements Armor Soak
2017-03-28 20:02:00 -05:00
6a2d0826cb
Merge pull request #3126 from Anewbe/box_cutter
...
Adds Boxcutters
2017-03-28 19:59:09 -05:00
7e279ebd03
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into electric_welder
...
# Conflicts:
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-03-28 00:17:28 -05:00
77886b648c
Fixes a travis issue
2017-03-27 23:22:36 -05:00
d66e1beca0
Adds the electric welder
2017-03-27 22:43:20 -05:00
73ab115295
Fixes a thing.
2017-03-27 22:32:02 -05:00
e4ca4707d1
Fixed code at Neerti's request, fixed a small sprite error where crowns appeared in the wrong hand.
2017-03-27 21:24:47 -05:00
0f98eedab4
Fixed indentation
2017-03-27 17:16:06 -05:00
971eb97399
Fixed conflict? Maybe? Please?
2017-03-27 00:42:39 -05:00
431dd1d290
Adds taking drags from smokables
2017-03-26 18:07:35 -05:00
3c17d1b33f
Added in-hand sprites to most item lacking them from the Medical department.
...
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
3816d634ed
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
2017-03-24 16:35:31 -05:00
a80ea977d1
Adds Boxcutters
2017-03-23 15:27:48 -05:00
2c9c3e208e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
...
# Conflicts:
# code/modules/mob/living/simple_animal/hostile/giant_spider.dm
# code/modules/organs/blood.dm
# code/modules/organs/internal/lungs.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
83cc019562
Fixes phoron sprites. ( #3100 )
...
* Fixes phoron sprites.
* Re-adds the phoron-tank changes for the vox???
* touches up tank sprites
2017-03-20 19:31:42 -05:00
d4b6fc9f32
Merge pull request #3052 from Anewbe/emp_things
...
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
ac79f548e7
Sorta implements armor soak, very WIP
2017-03-10 20:26:37 -06:00
0465613465
Changes tank sprite for Vox
2017-03-08 12:36:43 -06:00
19710d9bd8
Reworks empulse and emp_act
2017-03-05 12:22:45 -06:00
facd055d07
Merge pull request #3037 from VOREStation/traybuckle
...
Fix two extra robust bugs
2017-03-03 18:23:25 -06:00
f7c22dc54d
Fix two extra robust bugs
...
Trays have no attack cooldown because they have this crazy-long snowflake code for attacks.
Beds (and children like chairs) don't track target for grab-buckle do_after, letting them run away and get teleported back to the chair and buckled regardless of their efforts.
2017-03-03 16:25:53 -05:00
bb2adf1290
Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
...
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
acf30da072
Merge pull request #3033 from VOREStation/surgidesc
...
Fixes descriptions on 3 surgical tools
2017-03-02 15:23:27 -06:00
55d5c2d615
Fixes descriptions on 3 surgical tools
...
Someone forgot theeeese. So they showed the "Ahelp this" description.
2017-03-02 14:08:13 -05:00
561f10bced
Merge pull request #3013 from Anewbe/lung_cancer
...
Minor smoking update
2017-02-28 21:28:27 -05:00
8875c5ce1f
Merge pull request #3027 from VOREStation/implanters
...
Make implanters able to be created
2017-02-28 20:26:48 -06:00
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
12abb2d6f2
Ports a large chunk of the map datum system that europa/bay uses.
...
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
a85e170ce4
Minor smoking update
2017-02-24 17:15:38 -06:00
9d0fd9b866
Merge pull request #3005 from Leshana/papershredder-enhancement
...
Enhances the Paper Shredder
2017-02-23 11:28:28 -06:00
d7b82fc719
Added new "default_apply_parts" facility to machines to create default parts.
...
* Every constructable machine with a circuit board needs to create its required parts in its constructor. These parts must be the same parts specified in the machine's circuit board, otherwise you get the wrong parts when you deconstruct. This creates an opportunity for error which we can eliminate by reading the circuit board's part list and just adding those to the machine directly! Plus its less tedious.
* Implemented it on the jukebox.
2017-02-22 17:28:24 -05:00
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
283b58e93d
Fixes dragging clothing with storage onto an occupied hand
...
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that. So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied. Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00
47a1fe134a
Merge pull request #2978 from nachomeep/master
...
Adds fannypacks.
2017-02-05 18:07:01 -06:00
c2ed062b3f
Fixes custom loadout and slot system.
2017-02-02 15:37:27 -05:00
c81b18b40a
adds fannypacks
...
To custom loadout as well.
2017-02-01 18:31:49 -05:00
1b3b67b8ca
Merge branch 'master' into heart_damage
2017-01-30 22:43:09 -06:00
ccfbd7c9ac
Mining outpost camera console should work now
2017-01-29 15:25:53 -06:00
a6782f4371
Merge pull request #2944 from Anewbe/vox_toys
...
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
83db0cc38f
Medical tweaks
2017-01-23 23:43:44 -06:00
ac4b355f5e
Surgical tools will no longer cause damage on help intent
2017-01-21 18:34:05 -06:00
e23f5c2dd0
Vox airtank fix
2017-01-20 18:04:12 -06:00
f1d37c241d
Light boxes should be able to hold 24 bulbs/tubes now
2017-01-19 16:05:31 -06:00
MagmaRam