Arokha Sieyes
df84a2329a
Renames V-ANTAG to Event
2017-04-04 20:22:09 -04:00
Arokha Sieyes
9e90a293ec
VANTAG Hud stuff
2017-04-03 19:35:09 -04:00
Arokha Sieyes
c57e6e75b7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
Line ending changes?
2017-04-02 23:25:59 -04:00
Arokha Sieyes
7744777ea4
Merge pull request #1325 from VOREStation/aro-netgun
...
Adds the 'Hunter' Capture Gun
2017-04-02 21:39:16 -04:00
Anewbe
5dcd63b6b9
Merge pull request #3213 from VOREStation/aro-pol-nanosize
...
Fix nanopaste item size
2017-04-02 19:46:17 -05:00
Arokha Sieyes
4807b4e6e0
Fix nanopaste item size
...
I'm pretty sure this is an oversight, rather than a balance thing. Nanopaste is too big to fit in boxes or anywhere else, but seems to be identical to all other 10-stack items like medical stacks in other regards. It should probably be the same size as the other 10-stack items.
Even the icon seems to suggest this, since right now it is just as big as an entire box, though the icon seems to be more like toothpaste-tube and looks awkward sitting in the huge backdrop inventory space.
2017-04-02 19:33:25 -04:00
Arokha Sieyes
a06a1af3c2
Change my flash pistol to Hunter
2017-04-02 19:26:39 -04:00
Arokha Sieyes
cdf9fd476c
Adds the 'Hunter' Capture Gun
...
Dual mode stun-beam and net launcher, craftable in R&D. Would be legal for security to have on green since it's non-lethal. The stun beam has 10 shots like the taser, and the net launcher has 2 (uses the same energy). So basically 5 stun+1 net, or 2 nets, or 10 stuns.
Uses a new overlay system for updating it's icon rather than the "have one state for every possible combination" to prevent a huge mess of iconstates. Maybe Joan could look at this and use it sometime.
2017-04-02 19:25:27 -04:00
Arokha Sieyes
b7ed0aa156
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:21:45 -04:00
Cameron653
69223ac8f4
Fixes on-mob sprites
...
Item_state wasn't being set before, causing the on-mob sprites not to work (How the hell did this slip past me)
Also, removed a duplicate path for merc/taur
2017-04-02 17:49:37 -04:00
Anewbe
b0ba6c48c1
Merge pull request #3205 from Atermonera/Translator_Languages
...
Restricts animal languages
2017-04-02 12:25:53 -05:00
Atermonera
e7fb196a26
Restricts animal languages
2017-04-02 10:16:15 -07:00
Anewbe
1bc8b9d716
Merge pull request #3200 from Atermonera/Translator_Languages
...
Translators and animal languages
2017-04-02 11:04:22 -05:00
Cameron653
77f6d2fd78
Makes Carthatoline actually creatable
...
The ID for dylovene is "anti_toxin" not "dylovene"
2017-04-02 01:26:40 -04:00
Atermonera
d9c68e5b9b
Translators still check against hiveminds
2017-04-01 17:49:34 -07:00
Atermonera
971cd2da30
Translators don't understand animals and other languages that recorders can't record.
2017-04-01 16:48:01 -07:00
Atermonera
85c78001cb
Several simple_animals have their own languages, with custom syllables.
2017-04-01 16:46:28 -07:00
Leshana
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
Neerti
440b71331d
Merge pull request #3197 from Anewbe/lung_pop_and_brain
...
Lung damage QOL
2017-04-01 17:48:15 -04:00
Neerti
08f3173409
Merge pull request #3180 from Anewbe/carpspam
...
Gives fish an item drop
2017-04-01 17:47:40 -04:00
Neerti
5297089269
Merge pull request #3196 from Anewbe/self_target
...
Shouldn't miss yourself with your hands anymore.
2017-04-01 17:47:30 -04: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
29a25cc9b0
Merge pull request #3164 from Cerebulon/synth_brain_rename
...
Changes character setup to use correct in-lore names for brain types.
2017-04-01 16:00:19 -05: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
acee0a225f
Merge pull request #3195 from MagmaRam/splints
...
Splints
2017-04-01 12:00:32 -05:00
Anewbe
e116eeb919
Move brain damage from Oxyloss
2017-04-01 11:52:50 -05:00
Yoshax
6b794bb9d7
Small tea drinks bugfix
2017-04-01 14:10:32 +01:00
Anewbe
a0c1180fd0
Lung damage QOL
2017-04-01 00:10:18 -05:00
Anewbe
d8049a081f
Shouldn't miss yourself with your hands anymore.
2017-03-31 23:52:52 -05:00
MagmaRam
7690a91c8f
Splints will now show up on all limbs.
2017-03-31 23:22:13 -05:00
Anewbe
14fd8cce7c
Gives fish an item drop
2017-03-31 22:01:34 -05:00
Cerebulon
98d3ebf6dd
Fixed full options not showing up for non-FBPs. Repeated more thorough testing with newest changes.
2017-04-01 03:09:55 +01:00
MagmaRam
4000be7ec5
Merge pull request #3191 from Anewbe/flashlight_options
...
Adds a few more cosmetic flashlights
2017-03-31 20:07:42 -05:00
Anewbe
81aec38408
Fixes a text thing
2017-03-31 19:40:40 -05:00
MagmaRam
36044a6e01
Merge pull request #3190 from Anewbe/body_markings_tweaks
...
Tweaks a bunch of body markings
2017-03-31 19:39:45 -05:00
MagmaRam
4bb94a5506
Merge pull request #3187 from Anewbe/cargo_things
...
Adds a bunch of things to cargo
2017-03-31 19:39:24 -05:00
Anewbe
ca47d37d2f
Adds a few more cosmetic flashlights
2017-03-31 18:50:00 -05:00
Yoshax
7e27405e6c
Adds whitelist + custom item stuff
2017-03-31 23:25:59 +01:00
Anewbe
91be79fdb3
Tweaks a bunch of body markings
2017-03-31 15:17:02 -05:00
Yoshax
5a341ff38e
Fixes a bug with some languages
2017-03-31 17:52:15 +01:00
Anewbe
cc3e91de21
Merge pull request #3188 from VOREStation/aro-pol-bodymarks
...
Symbols make sprite accessories freak out
2017-03-31 00:58:15 -05:00
Arokha Sieyes
7f99b3b45d
Symbols make sprite accessories freak out
...
Like plus or ampersand or single or escaped quotes in the name, it goes crazy. You can't remove Socks+Belly because it has a plus, once you've added it. I have no idea why. But here's a quick fix.
2017-03-31 01:48:00 -04:00
Arokha Sieyes
44293624ff
Symbols make sprite accessories freak out
...
Like plus or ampersand or single or escaped quotes in the name, it goes crazy. You can't remove Socks+Belly because it has a plus, once you've added it. I have no idea why. But here's a quick fix.
2017-03-31 01:33:45 -04:00
Anewbe
72adee8fb8
Adds a bunch of things to cargo
2017-03-31 00:23:27 -05:00
Anewbe
5ceb96dfb5
Merge pull request #3186 from VOREStation/runtimes-fix
...
Fix Runtimes
2017-03-30 21:53:22 -05:00
MagmaRam
8b541292a5
Merge pull request #3183 from Anewbe/overdose_boogaloo
...
Overdose is more dangerous, Bicaridine works again
2017-03-30 21:00:44 -05:00
MagmaRam
4e43960fcf
Merge pull request #3177 from Anewbe/doona_organs
...
Diona limbs should be easier to remove
2017-03-30 20:53:45 -05:00
Anewbe
cf9e3f8789
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into overdose_boogaloo
2017-03-30 20:51:13 -05:00
MagmaRam
34e398d328
Merge pull request #3175 from Anewbe/hands_things
...
Device Cell QOL
2017-03-30 20:49:24 -05:00
