Charlie
634f9c72f1
Vampire Rework. ( #16476 )
...
* vampire rework
* fixes and tweaks
* cleanup + tweaks
* grug stomp
* TGUI
* TGUI rebuild
* UID fix
* debugging cooldown fix
* first review changes
* subclass refactor
* tweaks + some sprites
* blackbox logging
* tweaks + grammar
* minor UI tweaks
* ability icon sprites.
* placeholder sprite warning fix
* melee mod code comment warning
* nullification rework
* final sprites!
* fixes
* sabre review pt 1
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
* sabre review pt2
* sprites readd
* tgui rebuild
* removes traitor vampires
* fixes
* readds sprites
* runtime fixes
* hotfix
* more runtime fixes
* glare tweak. less confusing when the vampire is stunned.
* gargantua nerf
* minor tweaks.
* hemomancer nerfs
* bugfixes and cleanup
* I did a dumb
* couple of fixes
* confusion and shadow snare fixes
* hemomancer nerfs part 2 electric boogaloo
* TGUI rebuild
* fixes and easier events
* Umbrae tweaks
* gargantua tweak
* umbrae nerf 2 electric boogaloo. also var edit suggestion
* runtime fix
* buffs blood nutrition to be in line with its metabolic rate
* Henk stuff
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* more review changes
* final tweak
* affected request + runtime fix
* FUCK
* fat fucks
* darkness tweaks
* UMBRAE AAAAAAAAAAAAAHH
* force doors bugfix
* either git or I am drunk
* admin rejuv fix
* I CANNOT SPELL
* shitnt code
* steel review
* tgui rebuild
* mochi review
* vampire ability usage logging
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2021-11-14 15:34:56 +01:00
datlo
f92f20c74c
Fix cult structure stacking exploit ( #17091 )
2021-11-13 16:15:24 +01:00
Fox McCloud
06df88706f
Beginnings of Combat Changes: Ranged Weaponry ( #17075 )
2021-11-11 21:24:02 +01:00
variableundefined
9f2f9ac45e
Merge pull request #17038 from E-MonaRhg/carpet-stuff-two
...
The Subsequent Carpet PR: tweaks and tables edition
2021-11-07 10:24:47 -06:00
variableundefined
1739f411a2
Merge pull request #16823 from S34NW/3/4th-closet
...
3/4ths Sprite Project: Closets
2021-11-06 14:19:14 -05:00
SweetBlueSylveon
2fdcbf8551
Grey Plushie Get! ( #16991 )
...
* Adds a Grey Plushie
Adds a grey plushie to the game, putting it as a loadout option, and adding a new sprite.
* Adds water interaction
Adds a water_act to the plushie. The plushie will now changed to "grey_singed" when touching water.
Upon touching water the plushie will scream and go "AAAAAH!" which then puts all text and audio interactions onto a 300 cooldown.
The plushie can also be hugged to make it go "Ow..." if its icon is set to singed. This is on the same cooldown as vox screams.
* Minor fixes
Fixes minor syntax and redundancy problem in the code.
* Updated sprite
Adds new sprites for grey_plushie and grey_singed.
* Converts Cooldown and spawn system to timer.
Changes the cooldown and spawn system to a timer and callback system.
* Update code/game/objects/items/toys.dm
Adds early return.
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* Update code/game/objects/items/toys.dm
Simplifies code, corrects mistakes.
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* Complicated
-Splits the cooldown variable and proc into two, one for hugging one for screaming.
-Adds more BOOLEAN
-Properly implements Timer and Callback system.
-Adds early returns.
* Revert "Complicated"
reverts dme changes.
* Adds an if statement
Adds an if statement so that the server is not setting the icon and description every time the plushie gets wet.
* Minor correction
Fixes the order of the if statement and changes its type.
* Reverts test change
Last commit had testing changes I failed to revert before pushing.
* Changes the sprite.
-New, smaller icons.
-Slightly heavier shading.
(Can be undone and edited further, I still have the other sprites)
* Another sprite update
-I learned to use HSL.
* Small bugfix
Last code update I wrapped the screaming proc into the "don't set the icon and description if it's already singed" by accident. Swapping them around fixed it, and it will now be able to yell from water every 30 seconds again.
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2021-11-06 17:34:17 +01:00
E-MonaRhg
ac68ea59df
Carpet and table stuff
2021-11-05 19:46:42 +02:00
datlo
d94210031b
Refactor C4, subtypes, and airlock ex_act ( #16995 )
...
* Refactor C4 and Airlock ex_act
* update uplink desc
* Replace ismob by carbon, clarify comment
* remove unnecessary ismob check
* replace destroy by qdel, fix comment
* auto doc comments, add else condition
* Add comment to shaped c4
* Shortens shaped boom proc, make airlocks more resistant against light ex
2021-11-05 10:12:09 +01:00
hal9000PR
3b7e9fee93
refactors butchering of humans with chainsaw/meatcleaver ( #16812 )
...
* traits
* examine
* I am incapable of writing
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* people
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2021-11-05 09:11:10 +01:00
SabreML
1c3c2c22ad
Name Capitalisation Tweaks (Weapons) ( #16906 )
...
* Weapon names
* Assault rile
* More #coding_chat tweaks
Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.
* Missed these
2021-11-04 19:47:31 +01:00
variableundefined
2684afc85b
Merge pull request #17027 from Sirryan2002/birdsarentreal
...
Fixes a spelling mistake in implanter.dm
2021-11-03 20:08:01 -05:00
Sirryan2002
6f405149f2
spell check
2021-11-03 02:02:18 -04:00
Luc
b527838507
Fix abductor closet cloning mats ( #16985 )
...
* Update abductor closet to only drop one alloy
* Revert, make it just cost two alloy to make
2021-11-02 22:07:46 -06:00
S34NW
1723e0b503
Merge branch 'master' into 3/4th-closet
2021-11-01 10:14:41 +00:00
variableundefined
62d0df33ea
Merge pull request #16998 from lewcc/med-scanner-rads
...
Add radioactive message to health analyzer
2021-10-31 22:25:16 -05:00
lewcc
bbf92a4d1a
to_char -> to_chat
2021-10-27 10:05:13 -04:00
lewcc
812b58acd7
Add note for user rad contamination
2021-10-27 01:40:41 -04:00
SabreML
945e00e497
IAA locker, spare headsets, and general locker cleanup ( #16440 )
...
* Locker + Bookcase tweaks
* HoS flask
2021-10-26 23:09:45 +01:00
dearmochi
6e0006a145
Fixes fire axe wielded inhand sprite regression ( #16967 )
2021-10-18 16:16:11 +01:00
E-MonaRhg
f9c672ffa2
A lesson in testing your PRs ( #16969 )
2021-10-18 16:15:54 +01:00
variableundefined
066cd3be7b
Merge pull request #16932 from matttheficus/TrayQOL
...
Serving Tray Quality of Life - 8 Slots
2021-10-17 13:51:00 -05:00
variableundefined
edd1781e38
Merge pull request #16943 from E-MonaRhg/more-carpets
...
Carpet bomb your station: 8 more carpet types and a carpet cargo crate
2021-10-17 13:30:03 -05:00
SabreML
146351ae82
Cigarette overlay update ( #16936 )
2021-10-15 11:00:26 +01:00
E-MonaRhg
310616cdf3
Carpet bomb your local station
2021-10-14 20:23:11 +02:00
matttheficus
468ff53ac7
8 because i cant count
2021-10-13 17:27:38 -04:00
matttheficus
ee16debc62
oh god does this work
2021-10-13 17:22:53 -04:00
dearmochi
28f0035172
Prevent stunbatons from stunning AIs ( #16919 )
2021-10-11 20:49:38 +01:00
Mieszko Jędrzejczak
7c39eafafe
midori-san ( #16856 )
2021-10-09 17:06:43 +01:00
Qwertytoforty
40eb870732
Polishes up and fixes bugs with the syndicate teleporter ( #16844 )
...
* Polishes up and fixes bugs with the syndicate teleporter
* snake case
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2021-10-07 16:38:23 +01:00
Farie82
2d13c33906
Makes laser pointers not go through walls ( #16871 )
...
* Makes laser pointers not go through walls
* Add comment
* Use the laserpointer instead as center
2021-10-04 20:15:10 +01:00
Vi3trice
4b29431236
Makes the fireaxe visible on the back, and wow one line fix again?
2021-10-03 18:51:51 -04:00
AffectedArc07
129318891d
Nukes spacepods and associated jobs
2021-10-02 13:16:24 +01:00
Fox McCloud
ee22c8d4ee
Refactors Item Blood Overlays ( #16826 )
...
* Refactors Item Blood Overlays
* update
* remove blood color changing
2021-10-01 21:57:54 +01:00
Fox McCloud
0eac5b812c
Merge pull request #16798 from SabreML/telescopic-blood-overlays
...
Blood overlay fix for telescopic weapons
2021-09-28 00:31:41 -04:00
S34NW
83f8fbdfac
locker door and open state trimming
2021-09-28 00:51:19 +01:00
S34NW
1c867b414c
HERE COME THE CLOSETS
2021-09-27 19:33:42 +01:00
Fox McCloud
1c40951338
Ports Cloth Golems
2021-09-24 19:48:15 -04:00
SabreML
51c2c8840d
Telescopic baton/scythe blood overlay fix
2021-09-25 00:11:56 +01:00
variableundefined
b44432b8b8
Merge pull request #16667 from Fox-McCloud/secborg-purge-borg-tweaks
...
Removes Secborg, Tweaks Borgs: Combat Rework Edition
2021-09-21 08:41:22 -05:00
Stokes52
119385057b
Apply changes from AffectedArc's code review
...
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-09-19 07:43:00 -07:00
Stokes52
6c3675ad0c
Add voice modulator mask for crafting and traitor uplink
2021-09-19 07:42:21 -07:00
variableundefined
522390c0b9
Merge pull request #15675 from Fox-McCloud/his-grace-ascended
...
Implements Better His Grace
2021-09-18 15:26:30 -05:00
variableundefined
5ca3a34d3b
Merge pull request #16720 from Qwertytoforty/grabbing-your-attention
...
Makes revive, biodegrade, and freedom break grabs
2021-09-17 22:12:08 -05:00
variableundefined
fa3fa1dc6a
Merge pull request #16579 from FlattestGuitar/armor-defines
...
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
variableundefined
d0785adc20
Merge pull request #16700 from Qwertytoforty/thinking-with-cult-portals
...
Adds an item that lets cultists turn teleport runes into portals
2021-09-17 21:14:27 -05:00
Fox McCloud
b38a1e2fd7
removal of peacekeeper
2021-09-17 22:04:28 -04:00
variableundefined
6cbb29beb2
Merge pull request #16702 from SabreML/ghost-poll-names
...
Fixes some ghost poll chat messages being incorrect
2021-09-17 20:39:58 -05:00
variableundefined
cc29b0f7ad
Merge pull request #16711 from Vi3trice/and-my-axe
...
Fix - Removes twohanded wielding when equipping the item to a different slot
2021-09-17 20:34:13 -05:00
variableundefined
0c78315cf1
Merge pull request #16685 from datlo/credit-spam-removal
...
Removes service borgs being able to print credits
2021-09-16 20:51:28 -04:00
Qwertytoforty
4a4522641f
Removes uneeded procs, updates ability desc
2021-09-16 13:17:26 -04:00
