Commit Graph

24918 Commits

Author SHA1 Message Date
Arokha Sieyes
e69f5bf981 Make cells show correct icon when they spawn
Initialize is great for cells sitting on a counter or something when the map loads. But not really for cells in guns that R&D prints and stuff. Kinda needs to be in New().
2017-04-02 19:28:11 -04:00
Anewbe
d59f0f1dc4 Merge pull request #3152 from VOREStation/aro-pol-bodymarks
Adds Body Markings
2017-03-30 20:13:15 -05:00
Anewbe
2867f17b51 Merge pull request #3162 from Schnayy/department_jackets
Adds Department Color Jackets
2017-03-30 20:11:39 -05:00
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
9a9849d56c Merge pull request #3179 from VOREStation/vplk-fish
Added a few fish as simple animals
2017-03-30 15:37:46 -05:00
Anewbe
dc12d9b42f Merge pull request #3171 from Cerebulon/engineer_hand_sprites
Adds hand sprites to many engineering items
2017-03-30 14:27:45 -05:00
Leshana
b562941377 Added a few fish as simple animals
* They are simple non-hostile simple_animal's that wander around a bit.
* Wandering code is overriden so they will not leave the water.  And they will take damage as an unsuitable atmosphere if they do.
* Fish sprites improved and animated by Kligor
2017-03-30 13:09:11 -04:00
Yoshax
fb7da48588 Fixes an issue with smes deconstruction 2017-03-30 16:42:11 +01:00
Schnayy
a5384dab83 Fixed in-hand sprites, made adjustment to open icon. 2017-03-29 14:00:57 -05:00
Anewbe
e9ad3eba3a Merge pull request #3174 from VOREStation/aro-pol-squish
Copypaste error on *squish
2017-03-29 13:25:12 -05:00
Arokha Sieyes
a66eba807f Copypaste error on *squish
Whups!
2017-03-29 14:16:16 -04: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
365f92101d Reverted botched changes. 2017-03-29 05:49:44 +01:00
Cerebulon
55fd0a2041 Adds hand sprites to many items in the engineering department 2017-03-29 04:09:33 +01:00
MagmaRam
d98745d9d3 Merge pull request #3169 from Anewbe/italics_switch
Italics switch from / to | characters
2017-03-28 21:54:23 -05:00
Anewbe
cdf69e0eec Italics switch from / to | characters 2017-03-28 21:13:46 -05:00
MagmaRam
a3c83ac025 Robots, cyborgs, etc can now use grinders in the kitchen and chemlab 2017-03-28 20:47:38 -05:00
Anewbe
f91431fefa Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cigarette_sprites 2017-03-28 20:36:48 -05:00
Anewbe
7ae8d934f5 Should fix a Travis issue 2017-03-28 20:24:17 -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
0924e4e7a2 Merge pull request #3135 from Belsima/skrell
Skrell sprite updates.
2017-03-28 18:28:58 -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
Yoshax
b7f0e47be1 Fixes a few things 2017-03-28 21:15:45 +01:00
Anewbe
a65722929f Merge pull request #3086 from ghost/robot
Adds a fuckton of robot, hologram, and AI sprites.
2017-03-28 14:38:08 -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
2253838114 Merge pull request #3163 from VOREStation/shuttlebetter
Shuttle system tweaks
2017-03-28 14:00:16 -05:00
Arokha Sieyes
77a73a898a Shuttle system tweaks
Fixes one line of code and touches up cryo shuttle look
2017-03-28 11:59:36 -04:00
Schnayy
5cf0d35d1d Adds Department Color Jackets
Moves/renames red&black jacket to sec_dep_jacket, adds supply, engineering, medical, and science jackets. Puts them all in the loadout.

Have one issue: when the jacket is open there are no handsprites. How do I fix that without duplicating sprites?
2017-03-28 03:39:10 -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
b5696a9c6f Merge pull request #3155 from Schnayy/flower_crowns2
Flower crowns with fixed conflict? Maybe? Please?
2017-03-27 23:32:47 -05:00
Anewbe
6e7aa75835 Merge pull request #3141 from VOREStation/shuttlebetter
Dynamic Shuttle Walls/Landings
2017-03-27 23:26:35 -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
Yoshax
19fc61725d Properly fixes logic 2017-03-28 03:20:02 +01:00
Anewbe
ff21e5d786 FBPs should no longer scream when they collapse 2017-03-27 17:52:09 -05:00
Schnayy
0f98eedab4 Fixed indentation 2017-03-27 17:16:06 -05:00
Yoshax
567e4ff819 Removes some duplicate vars and improves on auto-rollability detection logic, along with general icon application logci 2017-03-27 22:16:39 +01:00
Yoshax
7e9a15e56f Fixes some missing icons 2017-03-27 22:04:50 +01:00