joep van der velden
86c8cf0c8b
PM's work again
2019-04-27 22:25:04 +02:00
AffectedArc07
fa6ba7343f
Merge branch 'master' into ss-alarms
2019-04-23 20:37:42 +01:00
Fox McCloud
ff1edb1080
Merge pull request #11300 from Arkatos1/Ghost_Hud
...
Adds Observer HUD buttons + Refactor of some ghost verbs
2019-04-23 15:11:15 -04:00
variableundefined
624699e6d9
Merge pull request #11332 from Arkatos1/VarArts
...
Adds an option to grant Martial Arts via Var menu
2019-04-23 20:47:03 +08:00
variableundefined
ce87d5208f
Merge pull request #11355 from Kyep/href_hack_alert_fix
...
Fixes unnecessary pAI warning for admins
2019-04-23 20:42:10 +08:00
AffectedArc07
acee1dcb42
SSalarms
2019-04-23 12:45:35 +01:00
variableundefined
03a5ee47b8
Merge pull request #11292 from farie82/puke-refactor
...
Refactors puke to make it less lag inducing
2019-04-23 19:45:01 +08:00
variableundefined
b738f9a92f
Merge pull request #11283 from Fox-McCloud/emote-refactor
...
Emote Refactor
2019-04-23 19:44:26 +08:00
variableundefined
b37e55998e
Merge pull request #11278 from Arkatos1/Summon_Ghosts
...
New Wizard spell - Summon Ghosts!
2019-04-23 18:52:03 +08:00
Kyep
e1fe8b3196
Fixes href warning
2019-04-22 07:35:58 -07:00
Fox McCloud
4761ded0d4
Merge pull request #11350 from AffectedArc07/ss-everything
...
Gives the orphans a home
2019-04-21 18:44:38 -04:00
Fox McCloud
f761acb2ff
Merge pull request #11318 from AffectedArc07/die-master-controller
...
Kills off the master controller
2019-04-21 15:44:54 -04:00
AffectedArc07
ff78ff1a9c
SScommunications
2019-04-21 20:12:14 +01:00
CthulhuOnIce
bb7582149b
these should be continues
2019-04-19 20:43:32 -05:00
Arkatos1
b0182639b2
Adds an option to grant Martial Arts via Var menu
2019-04-19 16:54:59 +02:00
variableundefined
31a2779bae
Merge pull request #11259 from Markolie/flukeops
...
Nuke Ops updates and buffs
2019-04-18 07:16:31 +08:00
AffectedArc07
52dff88bd9
Die monster! You don't belong in this world!
2019-04-17 16:30:43 +01:00
KasparoVy
489b10d47f
Runtime resolved
2019-04-16 19:43:56 -04:00
variableundefined
0bc6859d7e
Merge pull request #11305 from Fox-McCloud/its-time
...
It's Time
2019-04-16 19:48:20 +08:00
variableundefined
ff9de147e1
Merge pull request #11287 from Fox-McCloud/fix-goats
...
Fixes and Updates Goats
2019-04-16 19:48:04 +08:00
variableundefined
eb83a2dee7
Merge pull request #11285 from Fox-McCloud/elecrocution-refactor
...
Refactors Electrocution
2019-04-16 19:47:42 +08:00
variableundefined
e8b506be9b
Merge pull request #11304 from Markolie/claws
...
Remove infinite claw sharpening with whetstones
2019-04-16 19:42:08 +08:00
Fox McCloud
3ff16da2e2
Merge pull request #11301 from KasparoVy/vox-undergarments
...
Adds Striped Normal-height Socks & All the Undergarments for Vox
2019-04-15 11:44:34 -04:00
Fox McCloud
7f00f8313a
It's Time
2019-04-14 18:24:48 -04:00
Mark van Alphen
a9fa2f32e1
Remove infinite claw sharpening
2019-04-15 00:01:08 +02:00
KasparoVy
923614a475
Codes in the Undergarments, Final Sprite Tweaks & Armalis Fix
...
Removes the old Vox undergarments
Adds species_fitting of undergarments (making all the Vox versions usable) to update_icons and character setup preview
Disables undergarments for Armalis
Fixes & adjusts some Vox undergarment sprites based on testing results.
Removes flesh from shredded Vox uniform sprites.
2019-04-13 22:00:13 -04:00
Arkatos1
5ef674f4db
Code improvement, for real this time
2019-04-13 23:20:58 +02:00
Arkatos1
424432d3c0
Code improvement
2019-04-13 23:15:45 +02:00
Arkatos1
065ebeff30
Adds Ghost HUD and refactors some ghost verbs
2019-04-13 22:56:09 +02:00
joep van der velden
9166de2a3d
puke update
2019-04-13 10:56:30 +02:00
joep van der velden
55282f15d6
less puke related lag
2019-04-12 22:58:11 +02:00
Fox McCloud
58a7107eae
shocking animals
2019-04-12 16:03:18 -04:00
variableundefined
19a26909dc
Merge pull request #11279 from Arkatos1/Orbit
...
Ghosts now orbit around their followed targets
2019-04-11 20:41:37 +08:00
Fox McCloud
cf880bd40b
Fixes and Updates Goats
2019-04-11 04:24:36 -04:00
Crazy Lemon
6c4eb66da8
Merge pull request #11282 from Fox-McCloud/atmos-defines
...
Atmos Define Cleanup + Plasma Tweaks
2019-04-10 22:18:52 -07:00
Fox McCloud
90c9f3f479
Refacors Electrocution
2019-04-10 18:09:14 -04:00
Fox McCloud
c536c55b28
Emote Refactor
2019-04-10 15:42:12 -04:00
Crazy Lemon
1a57f440df
Merge pull request #11257 from Fox-McCloud/nations-update
...
The Nations Update Everyone Deserves!
2019-04-09 20:47:34 -07:00
variableundefined
1a5b5dabe4
Merge pull request #11230 from Fox-McCloud/tweaks-crit
...
Newcrit Death Tweak
2019-04-10 10:47:02 +08:00
variableundefined
9ae231ee99
Merge pull request #10327 from Fox-McCloud/fix-cqc
...
Fixes and Updates CQC
2019-04-10 10:36:44 +08:00
variableundefined
17030d02fe
Merge pull request #11214 from Arkatos1/Sling_Chat
...
Shadowlings now have a slightly bigger colored text when speaking in the Shadowling Hivemind
2019-04-10 10:13:16 +08:00
Fox McCloud
06713d604f
Atmos Define Cleanup + Plasma Tweaks
2019-04-09 11:22:01 -04:00
Arkatos1
da73c134db
Ghosts now orbit their followed targets
2019-04-09 02:17:40 +02:00
Arkatos1
21d212767f
Summon Ghosts spell
2019-04-08 21:45:09 +02:00
Fox McCloud
03d894ecfc
Merge remote-tracking branch 'upstream/master' into fix-cqc
...
# Conflicts:
# code/game/objects/items.dm
2019-04-07 19:54:14 -04:00
Crazy Lemon
b59a5d37b6
Merge pull request #11266 from Markolie/hotkeymode
...
Fix Hotkey Toggle button
2019-04-07 14:16:06 -07:00
Mark van Alphen
ddc3a02ab3
Fix thermal for saboteur, reinforcement bugfix, re-add C4 pack
2019-04-07 23:04:43 +02:00
Mark van Alphen
f63b587f54
Nuke ops updates
2019-04-07 21:57:22 +02:00
Mark van Alphen
91e6cb9347
Fix hotkey mode button
2019-04-07 18:42:08 +02:00
variableundefined
ff8dc59367
Merge pull request #11229 from Fox-McCloud/reagent-tweaks
...
[Goonchem] Reagent tweaks
2019-04-07 21:22:18 +08:00
