Commit Graph

31781 Commits

Author SHA1 Message Date
Wayland-Smithy 2d3a6dbcd8 no more random ESC events 2020-07-14 18:26:04 -04:00
EdgeLordExe 7cc4073b93 [READY] Addictions: 3 new drugs to show off a fun feature. (#51930)
* E

* EE

* AAA

* Update code/modules/reagents/chemistry/reagents/drug_reagents.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* ee

* e

* e

* EE

* Apply suggestions from code review

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* performance!

* E

* Update code/modules/reagents/chemistry/reagents/drug_reagents.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* E

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-13 13:20:45 -04:00
ShizCalev 2b382db99a Merge pull request #52182 from ArcaneMusic/chemfix
fixes chemical plant analyzer examine for reacted chems.
2020-07-13 13:03:06 -04:00
ShizCalev 98ce06d682 Merge pull request #52153 from Iatots/uplink-shuffle,-clownops
Clownops buff: can order tactical naptime kit, bioterror bundle. Moves meathook to right line-height
2020-07-13 13:00:37 -04:00
skoglol 8d2876b679 Merge pull request #52168 from EOBGames/mafiamaps
Vampire's Castle: A New Map for Mafia
2020-07-13 10:48:22 +02:00
skoglol 496d4772ec Merge pull request #52179 from ArcaneMusic/fixeroni2
Makes vend-a-trays usable by bartenders, adds them to a technode.
2020-07-13 10:46:02 +02:00
skoglol 61c3774b4b Merge pull request #52064 from MrDoomBringer/supplyreturnpod
The Supplypod Renaissance Part 4: Admins can get/send/teleport things around easily with the power of supplypods!
2020-07-13 10:30:06 +02:00
MrDoomBringer f50177e6b0 man i hope i won't have to rebuild tgui 30 times
To Fikou


fixes stealthpods


critical bugfix


i hoped wrong


fixies


accdiently enabled a unit test lmao


fixes and wixes
2020-07-12 23:04:59 -04:00
LemonInTheDark dbdb2d33fe Merge conflict begone 2020-07-12 17:37:14 -07:00
skoglol a489164005 Merge pull request #52165 from Tlaltecuhtli/caps
monkey caps drop on the floor if no ghosts got polled
2020-07-12 22:43:03 +02:00
skoglol 3c30af5ddc Merge pull request #52020 from Ryll-Ryll/cronch
[READY] Vendors can tip on people thrown at them extra hard, lets you set ejection speed on disposal outlets
2020-07-12 13:59:38 +02:00
skoglol c5026e8f31 Merge pull request #52140 from LoserWasTaken/crazy
blood cleave nerf
2020-07-12 13:54:06 +02:00
skoglol ad37765b04 Merge pull request #51963 from Maurukas/wingreconstruction
Reconstructive surgery for moth wings
2020-07-12 13:43:52 +02:00
skoglol 03720bb2ea Merge pull request #52142 from Alterist/Stomach
Adds Code and Sprites for Cybernetic Stomachs
2020-07-12 13:40:25 +02:00
LemonInTheDark 94dbb3cdb7 Fixes grounding rods not grounding (#52044)
* Fixes bolts not grounding properly due to a pass by ref

* This should obey the order
2020-07-12 13:28:32 +02:00
ShizCalev cc7851b662 Fixes plasmamen racial ignitation stuff ignoring fireproofing traits (#52039)
* Fixes plasmamen ignoring fireproofing traits

* fixes drunk code
2020-07-12 13:27:11 +02:00
tralezab 47c6ff7b7f Mafia Map Fixes and Removal (#52066)
* map fixes 😋

* removes necro for the time being

* lavaburn gone from update_fire code

* trait system (pog)

* small fix :)
2020-07-12 13:26:29 +02:00
skoglol 06c5a7afdf Merge pull request #51854 from MrDoomBringer/supplyprettypod
Please check out this EPIC OFFICIAL PR TRAILER before reading (very important)
https://youtu.be/4RckVdx20oQ
the video is kinda autistic

dont forget to upvote
About The Pull Request

All sprites and epic meme videos made with love by yours truly
Except for the 2 missile sprites. Those were taken and modified from NSV13 who in turn ported them from TGMC
nupod_all_decals

Anyways, this adds:
New pod, reverse-pod, and target indicator sprites
Pod-ground collision effects (impact craters basically)
Cool looking vapor trails a la the half-life 2 headcrab shells

And also:
Fixes seethrough pods not actually working
Makes reverse-mode a bit more predictable
Has some minor code improvements with how supplypod-reverse-mode works
2020-07-12 13:24:37 +02:00
Alterist b7936989db Update stomach.dm 2020-07-12 19:22:21 +08:00
skoglol aeaf321125 Merge pull request #51922 from Tlaltecuhtli/signaler-cobeyto
conveyor switches can now be actived with signalers
2020-07-12 13:02:08 +02:00
skoglol ad0a9139e8 Merge pull request #52087 from KathyRyals/floralsomaltorayinstab
[READY]Plant mutation chances at 80+ instability is now a sliding scale.
2020-07-12 12:47:05 +02:00
skoglol 6bcb653a5f Merge pull request #52049 from EdgeLordExe/hbalancing6
HERETICS : makes ascension automatically greentext if you do it.
2020-07-12 12:41:07 +02:00
skoglol 951f8d221d Merge pull request #52071 from KathyRyals/tendwoundsshutthefuckup
[READY]Surgery steps no longer spams the chat of people far away from the surgeon.
2020-07-12 12:38:09 +02:00
skoglol 521399b3b7 Merge pull request #52086 from ShizCalev/ballistic-gun-mag-runtime-fix
Fixes runtime when doing things with a ballistic gun without a magazine loaded
2020-07-12 12:24:41 +02:00
ArcaneMusic fa5cf0496b fixes chemical plant analyzer examine for reacted chems. 2020-07-12 06:08:13 -04:00
skoglol 7ec3849d63 Merge pull request #52158 from LemonInTheDark/help-me
Fixes acid/fire/blobs/a few other things touching objects below a tile
2020-07-12 11:56:26 +02:00
skoglol 28e44ba553 Merge pull request #52147 from ShizCalev/examine_more-runtime-fix
Fixes examine_more runtime
2020-07-12 11:49:26 +02:00
skoglol 6dcda573c4 Merge pull request #52155 from tralezab/blargety-missing-sprites
Monkey mind mag helmets's sprites don't break on updating their icon_state
2020-07-12 11:42:40 +02:00
skoglol e7643a8350 Merge pull request #52156 from Ryll-Ryll/tip-fix2
Fixes tipped player medbots never being able to walk again
2020-07-12 11:40:55 +02:00
skoglol 8fcd9d81ed Merge pull request #52157 from Ryll-Ryll/sick-kicks
Adds smite to tie someone's shoelaces together
2020-07-12 11:39:45 +02:00
skoglol c0c43380b1 Merge pull request #52150 from ShizCalev/monkey-mind-magnification-helmet-fix
Fixes qdel loop for monkey sentience helmets
2020-07-12 11:36:54 +02:00
skoglol 7f2a766843 Merge pull request #52077 from silicons/cameras
fixes cameras crashing the server
2020-07-12 11:16:37 +02:00
LordVollkorn 5fd23707d9 [READY] New Sprites and Icons to fix certain items (#52154)
* New icons and sprites

* DNA sample kit sprite

Co-authored-by: MrDoomBringer <mrdoomboyo@gmail.com>
2020-07-12 11:08:07 +02:00
ArcaneMusic b26deb6707 Makes vend-a-trays usable by bartenders, adds them to a technode. 2020-07-12 01:44:40 -04:00
Dennok c033e736ef Catwalk block uplifting from below. Base for similar Z move blocking things. (#52141)
* BLOCK_Z_FALL separate

Separate BLOCK_Z_FALL flag to BLOCK_Z_OUT_DOWN, BLOCK_Z_OUT_UP, BLOCK_Z_IN_DOWN, BLOCK_Z_IN_UP

* Propertly Z blocking for catwalk

Catwalk block z falling and uplifting from below

* Walkable lattice

Now lattice can support spaceman

* Replace BLOCK_Z_FALL flag

* Update _open.dm

* Update openspace.dm

* Update ladders.dm

* Update away_props.dm
2020-07-11 20:19:32 -03:00
EOBGames cafb2dc63b gothic map 2020-07-11 19:59:31 +01:00
Ryll Ryll e4397e0fca adds full monty for observer examine_more (#52088) 2020-07-12 04:34:24 +10:00
ShizCalev bb1a50c24b fixes radiation immune mobs getting irradiated (#52090) 2020-07-12 04:31:45 +10:00
Ryll Ryll 4a481bc861 Adds eye contact (#52108)
* doesn't do it for me

* signal and hijinx

* creep stare

* less lazy code
2020-07-12 03:39:57 +10:00
Wayland-Smithy 6f47ac7606 BLOB: Makes placing Resource and Factory Blobs require a blob_allowed area (#52119)
* Encourage blobs to stay on the station

* Fix space blob node bait
2020-07-12 03:30:06 +10:00
Angust 96c754b4ab Reversed vine production formulas and buffed event vine to compensate (#52116) 2020-07-12 03:28:16 +10:00
skoglol c914db4877 Fixes parrot possession (#52114) 2020-07-12 03:26:38 +10:00
Jordie 61d5549ac3 fix missing comma and argument name in edit query (#52127)
Co-authored-by: Jordie0608 <=>
2020-07-12 03:15:01 +10:00
Fikou 59cbfcd0da fixes bounty hutnignh ate sprite note towkfderking (#52133) 2020-07-12 03:12:16 +10:00
EdgeLordExe 05924db0d5 Speedmerge, voiceless ritual makes the ghouls INVISBLE_ABSTRACT, while they are alive, well and moving (#52135)
* AAAAASPEEDMERGE

* E

* deep
2020-07-12 03:11:21 +10:00
Maurukas a5aa02bad2 resolve conflicts with dissection removal 2020-07-11 09:51:14 -07:00
Alterist 62d0c93502 Cleans up Cybernetic Lung code (#52143) 2020-07-12 02:50:28 +10:00
YPOQ 931d0fd300 Fixes tracking not working near roundstart (#52138) 2020-07-12 02:49:29 +10:00
Tlaltecuhtli bff043de1d 1 2020-07-11 17:55:51 +02:00
tralezab 7d4b643583 shiv's review 2020-07-11 00:22:13 -07:00