2c1fcbd7da
Merges the Hug Module With the Cyborg Gripper ( #26007 )
...
* Hugs
* Update cyborg_gripper.dm
* Update cyborg_gripper.dm
* Update cyborg_gripper.dm
* AGHHH!
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update cyborg_gripper.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Update cyborg_gripper.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update robot_modules.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-08-07 13:07:36 +00:00
ec88636e6c
Cyborg Damage, Movement, and Power Overhaul ( #25252 )
...
* Adding defines
* More signals for external power
* Gets the reboot working
* renaming a proc
* config stuff
* Working on cyborg movement
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* IOSYS where'd you come from
* begon return 0
* VTEC caps slowdown
* Adjusting EMPs
* Funny arm is GONE
* Oh yeah regenerating stamina might be a good thing
* Forgot you could uninstall vtec
* icon machine broke
* Cell-less borgs can enter chargers to stay powered
* oh that was almost bad
* Fixes some logic
* its a surprise tool that will help us later
* Adjusting some numbers
* Adds a sound to go along with the text alarm
* dead things can still charge
* Another logic error
* Xenos too
* sorry linter
* fixes CL
* Slightly more slowdown on stam damage
* neurotoxin won't stun
* SOUNDS!
* 3 flashes to stun instead of 4
* Slightly longer stun
* SPEEDING UP BORGS JUST FOR THE TM SINCE CONFIG DONT WORK
* Keep borgs stunned forever
* Power loss is more dangerous
* Adds a stamina hud to borgs
* Cyborgs now heal up properly
* Removes an outdated comment
* Replacing parts works better now
* EMPs disable components for a brief time
* More missed rebalances
* When you forget to remove debug messages
* WHAT
* Cult magic works + borgs can be silenced
* 2 flashes to stun, flashes confuse now
* Update code/game/objects/items/devices/flash.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Abductors can stun borgs
* Watcher/cyro rays deal stam to brog
* Fixes a rounding error when healing borgs back to full HP
* Fixed span
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Fixed whitespace
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Guard clausify
* Indents a message
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/component.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* that's not what stat does
* No more hardcoded speed, don't TM this branch
---------
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2024-07-09 17:44:50 +00:00
4cf6595d12
Makes all playsounds use bools for vary ( #26183 )
...
* Makes all playsounds use `TRUE` for vary
* Same but for `FALSE`
2024-07-08 23:54:38 +00:00
9e6dcf9c46
removes the remaining datum redeclares ( #25220 )
...
* removes the remaining datum redeclares
* the two fixes
* finneee contra
* OK CONTRA
* readd
* CURSED TO BE BROWN!
* facking automerge
2024-04-21 18:26:35 +00:00
f20ca9e65f
allows med borgs to pet nymphs and mice ( #21070 )
...
* pprevents borgs from picking up nymphs or mice
* changes check slightly
* Update robot_items.dm
2023-06-17 11:00:47 +01:00
bead47ea29
Adds crawling. ( #17899 )
...
* crawling?
* knockdown. CONTAINS CHANGES THAT NEED REVERTING
* plotting can_moves death
* CANMOVE IS DEAD
* mappers are insane
* removes todos as the are todone
* decreases crawling speed
* silly-con fixes
* surgery fixes
* fixes death
* pAI fixes
* removes var/lying
* runtime fix
* decreases default crawling speed
* correct crawling dir
* some more fixes
* stunbaton tweak, revert later
* rejuv fix
* restraint and incapacitated refactor
* crawling dir in line with TG
* fixes vehicle movement and grabs
* alien rest fixes
* antistun fixes
* fixed fall sounds
* forgor to stage this
* first review
* canmove zombie dispersal
* fix
* lots of fixes
* defines
* fixes the trait helper
* if you got no legs you can still crawl
* sillyconfix
* no reverty keepy
* jaunt fix
* hopefully fixes perma sleepy zzz
* admin rejuv temp fix
* rest canceling
* antistun chems now remove knockdown
* buckle offset fix
* fixes some stuff
* crawling delay = 4
* descuffs bed
* sleeping hotfix
* fixes simple mob resting
* V is the macro for resting
* projectiles no dodgy
* refines the projectile check
* god I hate strings
* MORE FIXES
* I hate buckling
* fixes capulettium plus
* winding down
* farie review
* bugs did stop showing up
* SEAN
* todo
* sean review
* ed209
* i HATE cyborgs
* steel review
* laaaaaast things
* reverts stun baton changes
* and done
2022-06-30 11:57:52 -05:00
0f7a8707ef
[Ready] Refactors stuns and status effects. ( #17579 )
...
* Fixes reviver runtime
* Confusion status effect
* Dizzy status effect
* Drowsiness status effect
* decaying -> transient
* Drunkenness status effect
* why use timer when SSfastprocessing work good
* stuns (mostly)
* weaken and immobalise
* stun/weaken times
* update_flags redundancies.
* Slowed()
* Silence + fixes transient decay
* Jittery
* sleeping
* Paralyze -> weaken
* Cult sluring
* paralyse
* Stammer
* slurring + projectile cleanups
* losebreath
* Hallucination
* forgor this
* eyeblurry
* eye blind
* Druggy
* affected didn't like my spacing
* review pass
* second review pass
* some cleanups
* documentation and signal framework
* confusion fix
* Fixes spec_stun
* rejuv fix
* removes a TODO
* conflicted myself
* fixes
* self review
* review
* removes TODOs
* adminfreeze
* TM fixes
* hallucination fix + others
* tones down alchol and runtime fixes
* confusion overlay suggestion
* more fixes
* runtime fix
* losebreath fix
* clamp => directional bounded sum
* steel review
* oops
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* reduces the dizziness cycle rate
* borg hotfix
* sanctified decursening
Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2022-05-24 16:35:26 +01:00
b38a1e2fd7
removal of peacekeeper
2021-09-17 22:04:28 -04:00
2119063805
Removes Secborg, Tweaks Borgs, Adds Peacekeepers
2021-09-09 14:18:16 -04:00
a37652b70c
Logging View scaling, health, formatting changes
2020-03-26 21:34:55 +01:00
04ba5c1cc9
File standardisation ( #13131 )
...
* Adds the check components
* Adds in trailing newlines
* Converts all CRLF to LF
* Post merge EOF
* Post merge line endings
* Final commit
2020-03-17 18:08:51 -04:00
69537dd60c
Port TG hitby refactor and detonation of items by projectiles
2019-09-09 22:57:31 -04:00
4fc35a68b1
Gonna have to clean some files after this.
2019-01-19 22:38:47 -05:00
c03621c508
Completely Overhaul Logging
...
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
b519615e18
Removes peacekeepers
2017-10-20 10:23:07 -07:00
2fae0f1739
isrobot check
2017-09-28 12:15:52 +02:00
9c3d0a9f8a
bleh
2017-09-27 20:06:19 -04:00
e1ce6fac3b
oops
2017-09-27 19:21:25 -04:00
70d79e38f1
fixes
2017-09-27 16:01:48 -04:00
48f5e38913
oops
2017-06-04 15:13:15 -04:00
bca44eb0ee
Adds Peacekeeper Borgs
2017-06-03 17:01:42 -04:00
36b967c93b
Fully rips out cyborg sight modules
2017-01-10 00:32:11 -08:00
f5577b4a8f
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
88468d2698
Fixes Borg Stun Arm Bypassing Shields
2016-07-11 10:45:50 -04:00
71e5344a98
Mass replace
2016-07-07 19:34:02 -07:00
2f148fd429
Cell update
2015-09-28 19:04:22 +02:00
7678f601bc
Attack animation
2015-09-28 18:47:29 +02:00
52b700f8c8
Proper sprite/sounds for electric arm
2015-09-28 18:45:57 +02:00
5eee617063
Consolidate ?/FLW links under key_name_admin
2015-08-17 00:13:53 +02:00
a397c730b5
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-16 23:28:02 +02:00
29c59bd51b
Add check for antags in msg_admin_attack
...
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().
Goals of this commit:
- Make admin ATTACK: logs indicate if attacker is an antagonist.
Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
11a1deb1ac
Trying to cut down on attack lock spam
2014-05-24 17:17:38 -04:00
e3b27e3ecd
Cyborg hud modules now have proper icons
...
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
Conflicts:
code/game/objects/items/robot/robot_items.dm
2014-05-04 16:31:49 -04:00
9ad437b8c5
Adding checks for LAssailant everywhere whee
2013-12-23 04:57:44 -05:00
3fbdc99079
Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.
2013-08-28 03:33:04 +01:00
31349fb7d3
Merge branch 'incremental_tg' r5067 into bs12_with_tgport
...
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)
Conflicts:
baystation12.dme
code/__HELPERS/type2type.dm
code/controllers/configuration.dm
code/datums/datumvars.dm
code/datums/helper_datums/getrev.dm
code/defines/obj.dm
code/game/gamemodes/events/black_hole.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job_controller.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/card.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/turrets.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/turfs/turf.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/admin_memo.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/holder2.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/assembly/igniter.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/jobs.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/reagents/Chemistry-Machinery.dm
code/setup.dm
code/stylesheet.dm
code/world.dm
config/admins.txt
config/config.txt
html/changelog.html
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
icons/turf/areas.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 14:13:11 +10:00
6bd0e536bd
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
code/datums/organs/organ_external.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/hud.dm
code/game/jobs/job/captain.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/recharger.dm
code/game/objects/hud.dm
code/game/turfs/turf.dm
code/modules/client/client defines.dm
code/modules/clothing/head/misc.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/under/miscellaneous.dm
code/modules/mob/living/carbon/alien/humanoid/hud.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/monkey/hud.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_helpers.dm
code/modules/mob/mob_movement.dm
code/modules/mob/screen.dm
code/modules/paperwork/filingcabinet.dm
code/modules/power/cable_heavyduty.dm
code/modules/projectiles/guns/energy/temperature.dm
code/setup.dm
config/game_options.txt
icons/mob/screen1_Midnight.dmi
icons/mob/screen1_Orange.dmi
icons/mob/screen1_alien.dmi
icons/mob/screen1_old.dmi
icons/obj/atmospherics/passive_gate.dmi
icons/obj/pipe-item.dmi
interface/interface.dm
2012-10-05 22:21:26 +10:00
a39705d4d4
The RCD code is less ugly now.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4793 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 00:35:00 +00:00
4d236debd8
Applied Aranclanos's patch. http://www.nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10099
...
Fixes issue 928
Fixes issue 936
Remove a small bit of code rot in robot_items.dm
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4768 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 23:13:50 +00:00
c00b0ae84d
Added attack logging, some moderator groundwork, fixed alien species and save files.
2012-09-23 21:49:25 +01:00
28aabc9810
More file structure stuff!
...
Cleaned up the files themselves.
Everything in code/game/objects should now be in proper files or places with the exception of the files in the /weapons/ sub-folder.
There's two instances of me not following the exact file structure.
- /obj/item/brain has been moved to a file in mob/living/carbon/brain
- /obj/item/clothing/mask/facehugger has been moved into mob/living/carbon/alien/special
Both of these may not make sense according to the object structure, but they do make sense logically. If it's a problem just move them.
Next up: Finish the files in the weapon folder, then start moving defines down.
My god I hope I havent broken everything.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4547 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 03:32:58 +00:00
CRUNCH
