EmperorJon
a1cfdb6ee6
Merge pull request #1963 from SinTwo/NanoUI
...
NanoUIfication
2016-06-23 22:33:05 +01:00
SinTwo
2642bc1628
changelog and chemmaster fix
2016-06-23 15:01:17 -04:00
Yoshax
e129b6ffba
Merge pull request #1934 from SpadesNeil/implants
...
Loyalty implant for HoP
2016-06-23 05:02:48 +01:00
SinTwo
ccb3853eb3
removes unneeded returns and dir setting.
2016-06-22 16:34:26 -04:00
SinTwo
dee98ad055
missing font tags and accidental () left in removed.
2016-06-22 14:29:26 -04:00
SinTwo
90aadc61f9
fix to satisfy unit test
2016-06-22 14:21:55 -04:00
SinTwo
bc606ba9a4
more fixes and updates. cloning ui fixed.
2016-06-21 23:56:36 -04:00
EmperorJon
c056e007cd
Merge pull request #1956 from Yoshax/harpiesports
...
Various Bay Ports
2016-06-21 17:31:29 +01:00
SinTwo
244fb40de8
Fixes part 1
2016-06-20 23:32:18 -04:00
Neerti
23b9eaec6f
Merge pull request #1958 from Yoshax/cargofix
...
Adds missing cargo categories
2016-06-20 14:12:00 -04:00
Yoshax
0eab5e4b80
Adds missing cargo categories
2016-06-20 18:47:24 +01:00
SinTwo
32e9c4a34b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoUI
...
Conflicts:
code/game/machinery/adv_med.dm
2016-06-20 11:51:25 -04:00
SinTwo
1e2136781c
Adds NanoUI for multiple computers.
2016-06-20 11:48:52 -04:00
Neerti
c727d57872
Merge pull request #1953 from Anewbe/nt_fbp
...
Adds NT brand prosthetics
2016-06-20 11:43:52 -04:00
Yoshax
386b575af1
Fixes diona stuff
2016-06-20 00:47:17 +01:00
HarpyEagle
621241f705
Adds SLOT_BELT to heads
2016-06-20 00:32:33 +01:00
HarpyEagle
f0c8e0e516
Makes smaller mobs have smaller organs
2016-06-20 00:26:44 +01:00
Yoshax
cf76d6dac4
Fix stuff
2016-06-20 00:18:34 +01:00
HarpyEagle
8a2135c917
Replaces macro with span
2016-06-20 00:10:41 +01:00
HarpyEagle
78cd94b113
Fixes #12877
2016-06-20 00:10:25 +01:00
HarpyEagle
0f864e1390
Limits distance that mobs can be thrown based on relative size
2016-06-20 00:09:47 +01:00
HarpyEagle
8fc62cdbbc
Small mobs can no longer pin larger mobs
2016-06-20 00:09:37 +01:00
HarpyEagle
69dd0bb5d0
Makes it easier to break free of a grab by a smaller mob
2016-06-20 00:09:28 +01:00
HarpyEagle
6599f64b10
Stripping no longer uses requests, removes it from mob code
2016-06-20 00:09:00 +01:00
HarpyEagle
0ba2aef187
Fixes jointlock not accounting for species with less health or NO_PAIN
2016-06-20 00:08:51 +01:00
HarpyEagle
fd3a3175ae
Moving while unable to move and grabbed acts as a shortcut for resist
2016-06-20 00:08:36 +01:00
HarpyEagle
b410d43eb5
Adjusts attack_joint() so that disarm attacking is actually useful
...
If disarm attacking deals half damage but is expected to deal half
the damage to the limb before dislocating it, it's not any more useful
than just breaking their limbs, other than the fact that you do less damage
2016-06-20 00:06:21 +01:00
HarpyEagle
6ecf6bc154
Cleans up stance handling.
...
Now that dislocation no longer implicates !is_usable(), we can tidy up stance_damage calculation.
Also fixes stance being processed every tick except for the fourth, instead of the inverse
2016-06-19 23:58:44 +01:00
HarpyEagle
36e53d4b98
Fixes disarm-attacking being very likely to break the limb before dislocating it.
...
Also makes it possible to 'strike to cripple' with stunbatons
2016-06-19 23:58:16 +01:00
HarpyEagle
fcb8c63d2a
Fixes organs listed under organ tag instead of organ name when using undislocate verb
2016-06-19 23:54:35 +01:00
HarpyEagle
9976291ca4
Refactors dislocation, clearer distinction between is_dislocated() and is_usable()
...
Dislocation no longer relies on adjusting dislocated state of children.
Fixes dislocating and relocating parent organs magically fixing children or protecting children from being dislocated.
Dislocated limbs no longer count as unusable, since they already count for stance damage and dropping items anyways.
In addition, dislocated limbs add to traumatic_shock
Also corrects a misusage of traumatic_shock
2016-06-19 23:54:22 +01:00
Richard D'angelo
da3e206c1c
MakeGreed correction
...
Corrected according to PsiOmegaDelta, whom I trust blindly on this one
2016-06-18 17:22:03 -03:00
Richard D'angelo
2de751a8ee
Readded the click Catcher
...
To avoid losing the click catcher on the reloging
there we go, proper credits to
https://github.com/PsiOmegaDelta
2016-06-18 16:39:21 -03:00
Richard D'angelo
7ab5220f64
510 Improved Overlays
...
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.
I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.
Ported from:
7c2cc890ab
2016-06-18 15:50:10 -03:00
Anewbe
a1233d592c
Adds NT brand prosthetics
2016-06-18 00:24:36 -05:00
Neerti
1a53790a4c
Merge pull request #1950 from Yoshax/grabfuckoff
...
Fixes resisting out of grabs when weakened
2016-06-17 17:17:09 -04:00
Yoshax
bd80894d35
Makes cult sword an actual sword
2016-06-17 21:51:12 +01:00
mwerezak
d6a7d4ed04
Fixes resisting out of grabs when weakened
2016-06-17 19:28:34 +01:00
HarpyEagle
58b87f1a4b
Adds do_surgery() behaviour for various items
...
Heath scanners, autopsy scanners, syringes, hyposprays, droppers and bottles.
2016-06-17 19:06:56 +01:00
HarpyEagle
fc063115df
Makes do_surgery() into an item proc, refactors medical stack application
...
Surgery is now handled before attack() is called, no need to check that in attack()
2016-06-17 18:08:36 +01:00
Yoshax
6cb89d4d77
Makes costumes category not borked
2016-06-16 18:50:00 +01:00
Datraen
6e41272c4f
Merge pull request #1944 from Yoshax/fixsnowystuff
...
Makes snowy overlays have directions in the sprites instead of different obj's
2016-06-16 08:32:26 -04:00
Yoshax
3f9a5b9b91
no message
2016-06-16 04:34:48 +01:00
Datraen
70a282f1ec
Merge pull request #1941 from SpadesNeil/where-is-your-god-now
...
Fax, Prayer, and Emergency Comms
2016-06-15 17:24:12 -04:00
Yoshax
7d70f14f95
Makes snowy overlays have directions in the sprites instead of different obj's
2016-06-15 19:06:05 +01:00
Datraen
28872c5008
Merge pull request #1923 from Yoshax/supplygroups
...
Adjusts cargo categories
2016-06-14 21:07:37 -04:00
Yoshax
0d6381b3fc
Merge pull request #1940 from SpadesNeil/deagle-fix
...
Fixes #1918 , and Desert Eagle empty icons added.
2016-06-14 21:46:50 +01:00
Yoshax
2adf53d265
Merge pull request #1939 from VOREStation/emotestop
...
Prevent lobby players from seeing emotes
2016-06-14 21:46:36 +01:00
Spades
c89752a369
Fax, Prayer, and Emergency Comms
...
Resolves #1862
2016-06-14 16:32:13 -04:00
Spades
e650531dba
Desert Eagle empty icons added.
2016-06-14 16:17:25 -04:00
