cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,416 Commits 9 Branches 26 Tags
3530f71530ce6ea1ced9ca18cb3bc17a9f19b4e4
Commit Graph

6111 Commits

Author SHA1 Message Date
MagmaRam
19a9a8a413 Merge pull request #3172 from Anewbe/jumper_cables 
Adds in Jumper Cables for FBP reviving
 2017-03-30 19:46:26 -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
Anewbe
6328f1262f Adds in Jumper Cables for FBP reviving 2017-03-29 12:43:38 -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
9ff0180315 Merge pull request #3138 from Anewbe/radio_freqs 
Antag Radio changes
 2017-03-28 20:02:44 -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
MagmaRam
ff78d25ca1 Merge pull request #3160 from Anewbe/robo_climb 
Borgs can climb
 2017-03-28 19:57:19 -05:00
MagmaRam
add4607d98 Merge pull request #3159 from Anewbe/electric_welder 
Adds the electric welder
 2017-03-28 19:56:43 -05:00
Anewbe
dc58616dc8 Merge pull request #3153 from Yoshax/iconsplitting 
'Improved' solution to the full uniform.dmi problem
 2017-03-28 18:22:04 -05:00
Anewbe
cddbc6e976 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radio_freqs 2017-03-28 14:28:15 -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
b1620cfa20 Borgs can climb 2017-03-27 23:15:13 -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
Yoshax
ba7cad162d Revert "Makes space in the uniforms.dmi file" 
This reverts commit 6b0500dd27.
 2017-03-27 03:34:12 +01:00
Anewbe
431dd1d290 Adds taking drags from smokables 2017-03-26 18:07:35 -05:00
Neerti
565fea9648 Merge pull request #3144 from Anewbe/uniforms 
Makes space in the uniforms.dmi file
 2017-03-26 18:14:06 -04:00
Cerebulon
6472f02040 Removed unnecessary icon_state code. Added basic scanner sprite. 2017-03-26 22:00:09 +01: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
6b0500dd27 Makes space in the uniforms.dmi file 2017-03-26 00:59:14 -05:00
Anewbe
88b0c6086e Antag Radio changes 2017-03-25 14:19:57 -05: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
Cerebulon
38571fb8bc Adds in-hand sprites to several items. 
Hand labeller, light replacer, megaphone, binoculars, powersink, suit cooler and lantern.
 2017-03-23 22:03:17 +00:00
Anewbe
a80ea977d1 Adds Boxcutters 2017-03-23 15:27:48 -05:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas 
Adds rugged style PDAs
 2017-03-22 19:42:19 -05:00
MagmaRam
d603394226 Merge pull request #3121 from Anewbe/borg_zap 
Borg stun arm should work now
 2017-03-22 19:42:01 -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
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Anewbe
38598f3aae Merge pull request #3118 from Neerti/3/6/2017_surface_map 
Continues work on the surface map
 2017-03-22 16:33:40 -05:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103) 
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
 2017-03-22 14:30:07 -05:00
nachomeep
e1554f323b Adds engineering + science crates (#3072) 
* Adds engineering + scicrates.

* Enables the science crate

* Updates engineering crate icons.

* Inflatables don't need security.

* fixes RCD crates
 2017-03-21 18:38:47 -05:00
Neerti
b571ed9c66 Continues work on the surface map 2017-03-21 16:11:13 -04:00
Neerti
7d1245d180 Merge pull request #3113 from Anewbe/easy_communicators 
Communicator QoL
 2017-03-21 02:17:27 -04:00
Anewbe
c65588b099 Communicator QoL 2017-03-21 00:51:26 -05:00
Anewbe
f796914849 Fixes a thing with jetpacks 2017-03-21 00:27:31 -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
accf43e644 Merge pull request #3093 from Anewbe/translator_tweaks 
Translators can't output hive or nonverbal languages
 2017-03-17 08:52:31 -04:00
Anewbe
458f9ce6d4 Merge pull request #3096 from VOREStation/paraflate 
Add one inflatables kit to paramedic lockers
 2017-03-16 22:50:53 -05:00
Arokha Sieyes
400b0749aa Add one inflatables kit to paramedic lockers 
Makes sense to meeee. Hopefully it does to you, too. Gotta rescue those people!
 2017-03-15 23:56:52 -04:00
Anewbe
bf307ac0dc Translators can't output hive or nonverbal languages 2017-03-15 20:56:18 -05:00