Commit Graph

312 Commits

Author SHA1 Message Date
Poojawa
9558252b93 Revert/replaces a lot of #8024 with bleed_rate
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood.  Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
kevinz000
a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
Chayse Ramsay
f9d829b111 Proc to define 2019-08-04 05:48:08 +01:00
Chayse Ramsay
46e4023ba9 Monkey business 2019-08-04 05:07:24 +01:00
Chayse Ramsay
a0a21dc01f !iscarbon to !ishuman 2019-08-03 18:36:46 +01:00
Chayse Ramsay
5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains.
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
2019-07-28 17:31:59 +01:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
deathride58
7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
2019-07-17 18:07:57 -04:00
Ghommie
3546ed9799 Stamina damtype weaponry fixes. 2019-07-09 08:33:43 +02:00
Ghommie
5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00
Sishen
b2d5ec8d0c Update action_button.dm 2019-06-30 15:42:04 -04:00
Sishen
65d05f7df0 Goodbye golem AI 2019-06-26 00:08:42 -04:00
kevinz000
3527664c40 Merge branch 'master' into sprint_stamina 2019-06-16 19:55:56 -07:00
kevinz000
bd335ec3da fix 2019-06-09 02:27:54 -07:00
kevinz000
aca85123be Merge pull request #8555 from Ghommie/Ghommie-cit32
Updates radials, makes RCD and RCL use em.
2019-06-08 01:25:37 -07:00
Ghommie
5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000
46c548272c move stuff 2019-05-29 23:14:55 -07:00
kevinz000
b5c699cea8 adjustments 2019-05-25 21:57:25 -07:00
kevinz000
5d40d4b9a2 sprint stamina stuff 2019-05-22 12:18:47 -07:00
kevinz000
2ad8348a55 Merge pull request #8189 from deathride58/widescreenactionbuttons
Makes action buttons fill the entire screen on widescreen and other weird view sizes
2019-04-06 19:13:30 -07:00
deathride58
2ed9045173 Merge pull request #8164 from Poojawa/vore-mechanic-fixes
[Ready] Vore interactions, feeding, UI cleanup!
2019-03-31 21:19:20 -04:00
deathride58
b592297ed1 Makes action buttons stretch to fill the entire screen when widescreen is enabled 2019-03-31 17:16:24 -04:00
Poojawa
b11e3bbc96 Vore mode button and feeding 2019-03-25 04:19:00 -05:00
deathride58
8f782da23e attempts to resolve serverside lag with high playercounts by adding a sanity check to mouse movements 2019-03-18 21:59:42 -04:00
nik707
a89ab006c1 Adds new and immersive sound for combat
Dink!
2019-03-05 15:03:08 -06:00
deathride58
c11aba9368 oh, right. i've gotta add a snowflake check since /living lacks bleed() in the base code 2019-02-20 03:37:07 -05:00
deathride58
20740bda39 a bloody fun time - atomizes the med rework's blood effect changes and makes the blood reagent act more like you'd expect 2019-02-20 00:38:23 -05:00
deathride58
cbc21fe8db okay, let's watch the population drop - adds a config option that makes all stamina buffer actions free (TG-style gameplay) (#7608)
* "sTAM BAD REE" is like sandpaper on my nerves. so let's turn the server into a TG clone for a week and watch as the population dwindles to nothing just to prove a point!

* and the config, too
2018-11-09 19:10:20 -08:00
Poojawa
c8aec05ee9 Fixes mood hud missing with one weird trick
coders hate this!
2018-09-23 01:22:47 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
07cb9572bd Onclick 2018-09-11 01:33:01 -05:00
deathride58
21c07e6f97 Merge pull request #7441 from FlattestGuitar/blur
Blurry eyes just got blurrier
2018-08-12 20:38:50 -04:00
Unknown
054be386de readded defines; tweaked size 2018-08-08 12:39:19 +02:00
Unknown
9ca7e38f7a Blurry eyes just got blurrier 2018-08-08 11:42:30 +02:00
kevinz000
4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
Jordan Brown
16d5991dd6 Merge pull request #38308 from Cruix/multicamera_floor_plane
Moved picture-in-picture objects down to the floor plane
2018-06-07 08:42:04 -05:00
Cruix
9c4f4ce17f AI Multicamera mode (#37695)
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
2018-05-31 22:41:48 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Jordan Brown
e582e7019e Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
Fix various bugs with telekinesis
2018-05-25 10:49:21 -05:00
LetterJay
adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
2018-05-22 07:18:34 -05:00
Jordan Brown
1766134062 Merge pull request #37943 from AutomaticFrenzy/patch/mind-over-matter
Fix mindswap forcibly enabling ambient occlusion
2018-05-21 16:31:21 -05:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00