cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 21:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,519 Commits 9 Branches 26 Tags
ec7dbc1930a33b261e43ae432bf9bd95b17edf7f
Commit Graph

2393 Commits

Author SHA1 Message Date
Anewbe
66c06a02f2 Merge pull request #3225 from VOREStation/aro-pol-netbetter 
Make energy nets better
 2017-04-04 22:13:38 -05:00
Arokha Sieyes
1dfed9514c Make energy nets better 
You can imagine them as 8-second-resist office chairs that the mob is buckled to now. You can pull them around in the net, too, since it's baaaasically like an office chair now. They can't pull themselves around like office chairs while in the net, though. Because that'd be hax. You can click them (or resist) to start tearing them up (same from the outside).

Also keep in mind the mob inside can still wreck anyone adjacent (or shoot you). That's how it was before, too. So you can't really run up and drag them to prevent escape without them punching you (shouldn't you be roleplaying all this anyway?). Switching hands interrupts the resist so no reloading, getting other weapons, using PDA etc while resisting.

Also got rid of this SUPER SNOWFLAKE VARIABLE on all mobs used literally only by energy nets.
 2017-04-04 20:15:51 -04:00
Neerti
efbd137924 Merge pull request #3206 from Anewbe/shotgun_permit 
Adds permit items, including a gun permit and a bar gun permit
 2017-04-04 18:54:40 -04:00
Neerti
aae639dcb2 Merge pull request #3211 from Anewbe/towel_things 
Towels dry
 2017-04-04 18:53:36 -04:00
Cerebulon
340845babd Fixed various hand sprite issues. 
Several circuit boards/modules did not have sprites despite hands sprites existing.
Green and pink lunch/tool boxes appeared in the wrong place in the right hand.
Fixed defib sprite for new code, and added jumper cable sprite.
 2017-04-04 08:29:53 +01:00
Anewbe
21f2bfc12d Towels dry 2017-04-02 17:34:52 -05:00
Anewbe
c21223e334 Adds permit items, including a gun permit and a bar gun permit 2017-04-02 14:09:53 -05:00
Neerti
89088cdbda Merge pull request #3199 from Anewbe/flower_crowns 
Wooden circlets can now be worn as hats
 2017-04-01 17:47:09 -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
27b1db523e Wooden circlets can now be worn as hats 2017-04-01 15:31:06 -05:00
Anewbe
72adee8fb8 Adds a bunch of things to cargo 2017-03-31 00:23:27 -05:00
MagmaRam
34e398d328 Merge pull request #3175 from Anewbe/hands_things 
Device Cell QOL
 2017-03-30 20:49:24 -05:00
MagmaRam
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
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
Anewbe
c9bfabd426 Device Cell QOL 2017-03-29 13:58:35 -05:00
Cerebulon
1d09caa08d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into engineering_sprites 2017-03-29 06:24:06 +01:00
Cerebulon
55fd0a2041 Adds hand sprites to many items in the engineering department 2017-03-29 04:09:33 +01:00
Anewbe
f91431fefa Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cigarette_sprites 2017-03-28 20:36:48 -05:00
Anewbe
826b7c5af0 Fixes a thing 2017-03-28 20:17:35 -05:00
MagmaRam
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
MagmaRam
33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage 
Big Ol' Medical Tweaks
 2017-03-28 20:02:24 -05:00
MagmaRam
c7e224b6e2 Merge pull request #3075 from Anewbe/armor_soak 
Implements Armor Soak
 2017-03-28 20:02:00 -05:00
MagmaRam
6a2d0826cb Merge pull request #3126 from Anewbe/box_cutter 
Adds Boxcutters
 2017-03-28 19:59:09 -05:00
Anewbe
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
Anewbe
77886b648c Fixes a travis issue 2017-03-27 23:22:36 -05:00
Anewbe
d66e1beca0 Adds the electric welder 2017-03-27 22:43:20 -05:00
Anewbe
73ab115295 Fixes a thing. 2017-03-27 22:32:02 -05:00
Schnayy
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
Schnayy
0f98eedab4 Fixed indentation 2017-03-27 17:16:06 -05:00
Schnayy
971eb97399 Fixed conflict? Maybe? Please? 2017-03-27 00:42:39 -05:00
Anewbe
431dd1d290 Adds taking drags from smokables 2017-03-26 18:07:35 -05:00
Cerebulon
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
Anewbe
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
Anewbe
a80ea977d1 Adds Boxcutters 2017-03-23 15:27:48 -05:00
Anewbe
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
nachomeep
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
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things 
Reworks empulse and emp_act
 2017-03-14 21:39:01 -04:00
Anewbe
ac79f548e7 Sorta implements armor soak, very WIP 2017-03-10 20:26:37 -06:00
Anewbe
0465613465 Changes tank sprite for Vox 2017-03-08 12:36:43 -06:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Anewbe
facd055d07 Merge pull request #3037 from VOREStation/traybuckle 
Fix two extra robust bugs
 2017-03-03 18:23:25 -06:00
Arokha Sieyes
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
Anewbe
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
Anewbe
acf30da072 Merge pull request #3033 from VOREStation/surgidesc 
Fixes descriptions on 3 surgical tools
 2017-03-02 15:23:27 -06:00
Arokha Sieyes
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
Neerti
561f10bced Merge pull request #3013 from Anewbe/lung_cancer 
Minor smoking update
 2017-02-28 21:28:27 -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
Neerti
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
Anewbe
a85e170ce4 Minor smoking update 2017-02-24 17:15:38 -06:00