Commit Graph

949 Commits

Author SHA1 Message Date
Sirryan2002
ebf23682d5 Meathook now uses KnockDown instead of just Weaken (#18255)
* its knockdown time

* weaken tweak
2022-07-10 15:15:35 +01:00
KalevTait
99c1adbcf2 mining (#18283) 2022-07-09 12:24:55 +01:00
moxian
09e7f54a43 Convert most of /obj/machinery to use Initialize rather than New (#17845)
* Switch a bunch of /obj/machinery from /New to /Initialize

This is an easy and uncontroversial batch.
No globs, no late init, and stuff.

* Move more machinery to Initialize

This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.

* More tricky New -> Initialize migrations

* The last of machinery Initialize conversion

* fixups

* Newscaster armor fix

* styling

* Comment on armor handling

* Move newscaster armor definition back to datum

* farie82 review

* kill extra .=

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* farie's review part 2

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-06-29 08:33:52 +02:00
Vi3trice
8753e22a8e Rework toy card decks into standard decks (#17925)
* Go fish

* Keep forgetting about the map

* Forgot about the sprites for the double deck

* Cleaned things up

* Fix icon conflict

* Update cards.dm

* Improper tweaks

* Update cards.dm

* Axing the popup from the toy version entirely, that was a little jank

* Meta remap was merged

* Huh. \improper was the issue.

* Update cards.dm

* Few changes and a fix

* More changes

* Update cards.dm

* Update cards.dm

* Update cards.dm

* Merge branch 'master' into go-fish

* Update cards.dm
2022-06-27 22:38:15 +01:00
S34N
705578b23b Energy detective revolver (#17771)
* Initial defines

* more work

* icon

* more stuff

* UID not hard ref

* tidying

* overload go brrt

* le sound and dead cell

* delet gap

* initial chargepack stuff

* simplify

* oops

* yeet this

* placeholder sprites

* oops magic number

* the gun speaks!

* consolidation

* tweaking and tidying

* so long old gun

* icon purge

* reapplies placeholder

* 1 minute tracker, not two

* makes it use a pinpointer

* revert tiny map changes

* cease your tracking, fool

* oops

* soft refs

* charlie review

* projectile ref to firing obj, removes testing overrides
& cleans up signals

* some more UID null checks

* ICONS

* ICONS CONFLICT

* MORE ICONS

* makes it freaking work

* first pass fixes

* charlie review

* charlie review 2, variable boogaloo

* fixes holsters

* colours the overcharged shot

* and recolours tracker to be yellow to match charge

* yellow laser icon

* widen overcharge misfire %

* fixes unlinkable pinpointers

* fixes gun not speaking when tcomms setup is changed

* steel request

* no chargey

* loudening 2022

* steel part 1

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* restores missing sprites

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-25 20:15:09 +01:00
Kugamo
d4d4615fe2 Inhand sprites for metal sheets and ores (#17952)
* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* okay

* fix merge conflict
2022-06-14 13:34:08 +01:00
Bm0n
11b3566ed7 Adapts TG's version of Metastation for Paradise (#17724)
* proof of concept

* proof of concept fix

* cargo/sec/dorms/engi

* service and sci framework

* floors

* sciwaypoint

* major departments done

* candidateV1

* haha die runtime

* and a zoning error

* feedback+minorpipenetrework

* compile now please

* abracadabra

* runtimefix

* Morgue + medmaint rework

* zooooones

* forgot to delete placeholder :)

* firealarm

* floors

* dmg turf on powernode bad

* missing pipe and rogue loot spawner

* tgs pipe layout sucks

* hallway repipe and bug fixes

* MISSING TILE

* IAA, maints, SM loop expanded, pipes reworked and bug fixes

* small flip

* reverts shuttlered2 icon change

* replaces offical posters with contraband in maints

* floating cameras are not good for health

* AI core tweaks and robo storage console added to robotics

* pipe over top of vent, airlock name changes and missing spawnpoint added

* a few very small detailing changes while I wait for review

* oh and I forgot to give EVA and the teleporter room a holopad lol

* missing pipe and tile fix

* Adds more airlock helpers + few bug fixes

* i love warning stripes

* or not

* lightswitches

* zoning error fixed

* little chem update

* and firelocks

* cam fix

* minor detailing

* another missing holopad and a date change to reflect paralore

* fixes as mentioned above

* a missing side rail

* removes a good chunck of floor decals and fixes docking port

* wall stuff cleanup

* decal removed

* and an airlock

* sec depart revamp

* shutterfix

* aa

* thanks for the feedback :). should be all resolved

* quick edit

* directional cryo consoles are based, thanks sean

* akward vent no more

* how the hell

* murders var edited open shutters, another detail pass, xenobio extended by 1 tile

* quarantine lockdown shutters

* uh oh

* it just works(bug fixes)

* we should be done here

* this shouldnt have an auto airlock namer

* now it should B)

* i actually forgot one lol

* aaaahhhhhHHHHHHHH

* turned biohazard pump off + removed one warning strip

* also some door fixes

* minor touchups around bar

* ack

* air alarm fix

* stray docking port removed

* floortile dir removed

* cryo pod support added to perma

* decals removed

* """deconflict"""

* nanomob BATTLE terminals (yes I am running out of things to add)

* uh oh thats the wrong y pixle shift

* conforms with armoury standardisations

* buffs aux armoury light

* fixes icon state on air injector

* sigh.. holopads

* put a lamp in the bomb test range because the camera light doesnt work on paracode, fixed a few other things

* switch lattice out for catwalk at turbine

* minor detailing changes

* supply console fix

* HOP/Bridge supply consoles changed to non-public type

* few cosmetic tweaks around the hallway involving extinguishers, robotics locker added(even though it's kind of pointless with us having robodrobe), sci starting glass and meta buff

* 2 cameras moved off glass, slight sci chem buff with rwalls now fully protecting it, few posters moved to look less awkward

* the great tinted window removal of 2557(they kind of suck in paracode), also engineer burn medkit switched out for a standard one(in line with box)

* pipenet fix

* experimentor console added, var edited on pump changed out for on subtype

* experimentor room buffed with plasma windows(as on box)

* layering issue with a warningstrip in robotics fixed

* tile in abandoned med removed, maints glass door in botany replaced with solid door, few space heaters removed

* leftover pipe connector in maints removed

* dozen or so cameras moved about 1 tile so that they're no longer sharing a tile with a light, missing floor tile in brig fixed, cargo table cleaned up

* ooops one more camera in the vault

* /secure suit storage units replaced with normal type

* flipped decal so it's facing the right way

* high voltage warnings moved off glass in xenobio, high voltage warnings added around the vault

* quick highvolt sign fix

* replaces grimy floors with cleanable dirt, moves 1 camera 1 tile

* stand_clear decal added under armoury shutter

* Prison laundry camera added(same as TG), prison botany camra moved a tile

* slight adjustments to NTR and BS office in regards to camera and APC placement

* gateway cam move, AI sat wire moved to look more clean

* opacity change on prison transfer plastic flap

* AI Satellite antechamber turret controler fixed

* a few var edited pumps replaced with on subtype

* opps this tile should be catwalk not an airless plating

* AI upload gets firelocks+foyer gets vents and is fully set to AI upload access only, captains officer intercoms moves around a bit, lightswitches moved a bit

* oops the instead of the ai upload was missing a firealarm

* and the private subtype intercom in the captains office

* radio freq 1447 is what TG uses for their private channels, some intercoms had this set as a leftover from our old version of meta.

* Made it so that only the cheft can access the hydro fridge, fixed the hydro shutter button, added gateway access points to the gateway shutter button, fixed access on chemsitry desk

* rogue mechbay button removed

* names on solitary cells doors and flasher buttons

* forgot to fix a sink in perma I have been meaning to fix

* same as above, just a different sink

* chemistry desk change, looks better now

* engi light moved 1 tile

* moved shock warning signs(again), switched out metal botany tables for glass ones

* last of the sign fixes i hope, layer issue with tools in eva fixed

* damn signs

* and I missed two...

* slight signage cleanup on airlocks

* HOP office was missing door naming helpers

* New perma

* Camera pos change in perma, better arrivals lattice

* sign fix bridge

* added a second set of accepted/denied stamps to cargo, turned HOPs chair

* also got rid of a light in cargo

* tech storage access fix

* atmos desk cams moved around a tiny bit

* i sure hope no one noticed this one tile in the AI sat facing the wrong way

* spread the maints mice out a bit more

* fixed light placement

* found one more light

* moved cobweb off glass near space bridge

* starboard secondary maints zone fix on door

* and A-P maints

* more stuff on windows- which I hate! cringe!!!

* lights should not be beside each other

* This placement is better

* agh more lights in med

* cryodorms buff

* removes locker from maints room beside cryo since the room is smaller now

* ooops i forgot a holopad in the new cryodorms. also changs get a holopad

* annnd a floor tile

* arcade didn't have an intercom

* fixes window placement around vault from TG version

* wiring fix near vault

* old request console from old para ver of map named

* internal vault signs fixed

* more signs moved off walls and into a x/y nudge(yes i know i am being picky)

* A legecy area(the garden) gets an intercom

* moved*

* AI core flasher moved slightly to fix clipping with ai turret controller

* wall changes to the AI sat to make it a bit more clean

* news+ai request console fix

* The "Captains intercom" from TG doesn't exist in paracode so it has been replaced with an AI private intercom

* button fix

* oops

* reverts a sign change near disposals

* would you look at that i moved another camera 1 tile hahaha

* should be the last cams

* it wasnt

* fixed up the mirror in the bar backroom

* same fix applied to captains bathroom sink+mirror

* cleaned up janitor rooms intercom pos + firealarm

* bridge fire alarm moved tile down

* riot shields now stacked north to south to be in line with weapons

* 2x showcasese were missing their set names, oops

* layering fix in prisoner court cell

* Pen an paper added to BS office, APC move in showroom

* ack bs office again

* perma window fix

* extinguisher in sci moved

* det office cam fix

* remove brig prefix

* light and button tweak near bridge

* window layer again

* small tweak to the toxins loop obersvation room

* 1x wall

* clean up grillies by SM

* wiring changes/fixed in maints and at SM

* few small floor tweaks and sink shifts

* rwall akwardness fixed

* pipe under vent moved

* redid brig wiring and piping to look more clean

* one little oopsie

* more wires+intercom

* fixed the mess TG got themselves into with chemistry floor tiles

* redos medbays wiring to run along side the pipes rather than beside them

* same wiring changes that I did to med/sec but this time to the command area

* hop airvent moved on tile, some wires shifted

* unshocked window fixed

* lessens and spreads out the maints donk pocket spawns

* Viro now uses updated doors!
2022-06-11 14:09:32 +01:00
13spacemen
dc0e8b46f4 new 3/4 perspective ore box sprite (#17783)
removed older ore box sprites
2022-06-09 12:30:48 +01:00
Charlie
77d03f7ab9 Spellblade rework (#17693)
* fire lighting and shielding

* blink + lavaland loot

* file move and projectile removal

* get out of MY WALLS

* review

* sprites

* forgot this

* sprite update

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* some TM changes

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-06-06 16:22:18 +01:00
Qwertytoforty
e5266bdcac fixes bugged examine on docking beacons (#17877) 2022-05-27 17:33:12 +01:00
Charlie
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
AffectedArc07
d5e5d9e62b No more on station shelter capsules (#17674) 2022-05-03 04:29:14 +01:00
SteelSlayer
94306264f7 Improves logging on teleportation portals (#17637)
* teleporter logging

* affected review and improvements
2022-04-21 20:58:30 +01:00
atteria
bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568)
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
Luc
1b3b040ce5 Hopefully fixes spectral blade letting ghosts stay visible (#17602) 2022-04-12 15:53:37 +01:00
S34N
03beb422b2 Remaps CC, changes z1 layout (#17425) 2022-03-14 20:08:07 +01:00
Luc
b2704e06b2 [GBP: No Update] Fixes orbiting in vents and disposals (#17330) 2022-01-18 19:05:44 +01:00
Luc
8bec8c75b3 Orbit Refactor, Add Orbiter Count (#16718)
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-01-13 16:12:36 +01:00
S34N
ac6f9b4725 [IDB Ignore] Refactor icon smoothing to use 8-bit bitmasking (#16620) 2021-12-15 17:04:24 +01:00
Farie82
576482907b Refactors spell targeting to delegate it to a targeting datum (#16552)
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-12-13 17:40:36 +01:00
S34N
e23ee29fad Removes "name" design datums. Adds logging for null design error. (#17165) 2021-12-06 07:53:05 +01:00
Farie82
3c129736cd Fixes the Rod of Asclepius dupe exploit (#17112) 2021-12-03 15:06:51 +01:00
Fox McCloud
15ab57d78c Merge pull request #17047 from hal9000PR/PUZZLE
Removes prison cubes
2021-11-18 15:57:07 -05:00
S34N
b912fc901a more banned areas (#17108) 2021-11-15 21:51:16 +01:00
S34N
44c12c6d9d Fixes open crate sprites (#17050)
* fakin underscores

* more crates

* sneak this one in too
2021-11-06 21:42:47 +01: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
hal9000PR
8e581d06c2 remove don't remove 2021-11-06 18:25:21 +00: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
S34NW
1723e0b503 Merge branch 'master' into 3/4th-closet 2021-11-01 10:14:41 +00:00
SabreML
94a593cbb8 Stacking Machine GC (#16958) 2021-10-17 10:56:56 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01: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
Sirryan2002
2663d20dcd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HonkCrystalNuking 2021-09-22 01:20:09 -04: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
Sirryan2002
8da063ce17 Removes the Honk for good 2021-09-18 00:30:08 -04:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
botka4aet
ebf20f8806 Bone items review fix 2021-09-17 11:13:32 +03:00
botka4aet
d49cfd2322 2 new tribal items 2021-09-10 11:07:54 +03:00
variableundefined
c2664eec0d Merge pull request #16311 from S34NW/does-anyone-else-hate-genetics
Replaces genetics xray vision with other vision genes
2021-09-06 23:16:04 -05:00
Fox McCloud
23164e354b conflicts 2021-09-06 04:06:47 -04:00
SabreML
6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
SabreML
02fe0876f5 Fix bundle #3 (#16411)
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-08-05 11:04:27 +01:00
SabreML
6b326123ac DNR ghost spawns fix (#16458) 2021-07-30 14:57:36 +01:00
Fox McCloud
2bcb5ef403 Merge pull request #16359 from Edan52/gc-tweaks
Simple mob GC Optimisations
2021-07-26 15:48:56 -04:00
SabreML
865b19263c I am an idiot (#16421) 2021-07-25 11:37:15 +01:00
SabreML
fe6e445760 Manual ore redemption (#16414) 2021-07-24 10:26:07 +01:00
Farie82
64930de41c Makes all toy figurines tiny and refactors the code behind it (#15368)
* Makes toy figures tiny and refactors the code behind it

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* atom_say and capitalize names

* Web edit baby

* Merge conflict fixes

* Init instead of New

* prize_ball instead of mechball

* prize_ball should not be a figure. Revert but keep the Init change

Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-07-15 13:59:26 +01:00
Edan52
e81cfee52a gc tweaks 2021-07-14 01:00:27 +01:00