Commit Graph

3931 Commits

Author SHA1 Message Date
Kaomiyo
adf2e444cb TC Discount fix (#22111) 2023-08-26 10:36:44 -05:00
XFirebirdX
c4547e7251 Removes old lines of code mentioning genetic_damage, fixes text misleading to receiving "genetic_damage". (#22068)
* Removes and changes unrequired code and false text

* Update code/modules/antagonists/changeling/datum_changeling.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-08-25 17:04:25 +01:00
GDN
02b5773a72 makes ghosts that sign up for an ert gc (#22065) 2023-08-25 16:52:46 +01:00
matttheficus
7a23c5108e Krav Implant for Nuclear Operatives (#21963)
* oh god we can finally Krav with MODs!

* Update uplink_nuclear.dm

* grammar + tweak to desc

* oopsie missed a character
2023-08-25 16:49:29 +01:00
PopeDaveThe3th
0b39956cf1 Fixes the Timestop spell (#21998)
* Fixes the Timestop spell

* Update code/datums/spells/conjure.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-25 16:45:49 +01:00
Henri215
f57212e8be Fixes a fake virus runtime (#22050) 2023-08-25 16:24:54 +01:00
Luc
cb87070590 ensure only slimes can bubble and pop (#22032)
* ensure only slimes can bubble and pop

* ahhh eto
2023-08-23 21:29:00 -05:00
matttheficus
c65945e7dd desc fix (#22090) 2023-08-23 20:59:06 -05:00
Charlie
25214e07c3 checked on my 90 quid calculator (#22058) 2023-08-23 20:49:57 -05:00
HMBGERDO
979935a7c9 Fixed Trick Revolver, Added Trick minibomb (#21915)
* trick revolver fix, trick minibomb added

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/grenades/syndieminibomb.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/revolver.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/revolver.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/weapons/grenades/syndieminibomb.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/revolver.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-08-21 19:56:33 +01:00
Venuska1117
d6c266a058 Add new Admin Structures (Templates for Events) (#21909)
* Adding Event Ruins/structures

* Adding new stuff

* Rename .txt file
- Added 2 structures for now, they are admin_event structures.

* .info

* Sorting...

* Add Event Structures to Map Template - Place

* removed file.

* Add paper and pens to sanbox
- change map description for sandbox

* Add Paper and pen's

* Fixed spelling
- Requested by Henri215
2023-08-21 19:51:55 +01:00
Contrabang
c40e406ac1 hoooly shit (#21889) 2023-08-21 19:48:45 +01:00
BiancaWilkson
67053433b7 uh oh (#22044) 2023-08-21 09:57:45 +01:00
matttheficus
597835b031 The TC Inflation Act of 2023 - No Balance Changes This Time (#22024)
* its time for me to make Hal cry again

* hal review
2023-08-21 00:20:47 +01:00
Qwertytoforty
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself

* more shit

* progress continues, moral stays sameish

* bite of 2587

* mod_theme down, but probably broken

* 385 errors, 16 warnings, zero tgui interactions

* 292 19

* final strech to buggy mess, break time

* it compiles. It almost fucking certainly doesnt work, but it compiles

* fudhsciffubgsbgpgb actions not working as should for modules

* fuck it we'll just open the pr as we work on it

* icons work now

* tgui stuff

* more progress

* JUDGEMENT

* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.

* jetpacks, gps, and go do what exo-suits yourself

* almost ready

* sorry to whoever has to review this

* should work™️

* should be good now

* pushing changes so I can do reviews next

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* lore™️ Adds illegals level to modsuit parts from syndicate.

* early returns

* and these illegals

* no uplink reference idiot

* mod inhands are a good idea

* this is needed for inhands nerd

* Bomb detector working, modsutis cover ears. skin things

* overslotting removal, cyborg charging, ert loadout for gamma

* duplicated signal

* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.

* tether module, orb module, holster stuff

* built in no slip, cheaper 87

* removes modules already installed, engineer ert get jetpack, equip into modsuit storage

* comments spaces and duplicate flags

* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Compile TGUI, slowdown adjustment, Modsuit to MODsuit

* sonar, do after, more equipment, acid handling

* overlay bugs / ERT / DS suits autodeploy

* middle click action buttons

* traders, sec modsuit energy nerf

* surplus weighting

* Kinesis module.

* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis

* more power / unused module removed

* name, ds fix, pre equipped to cc suit

* depot / grammer

* ok should be good™️

* overslot, dupe gun, missing suit storage

* stealth nerf, new kit

* gun stuff  / ds theme

* bio armor is gone

* let me push changes please thank you

* makes shocks work right

* copies over some changes TG made to module prices after porting

* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-

* sirryans changes

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/telesci/gps.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/telesci/gps.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Control define, ERT / DS have gloves / boots again.

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* More changes

* god I hate tgui. Why do all the bundles live underground, instead of in my basement?

* she updates my master till I testmerge

* modsuits can recharge again

* fixes a lot of shit

* Ready for TM probably

* sure fuck it whatever that makes sense I guess

* the pinpointer works better™️

* Another storage module bug fix

* hair and medical stuff

* fuck fuck fuck

* fixes sonar

* Bag exploit fixes / plasma runtimes / ear nerf

* dna lock improvement / cryostorage

* whoops

* Ball form second cooldown wasn't helping, no more infinite cores

* she springs my lock till I ***SNAP***

* plasmaman no longer die

* fixes modsuit emp issues

* atmos no longer fucking dies

* Fixes, module printing, and a restriction on newly constructed modsuits

* Inventory code my hated

* WOOO PREFERENCE CODE WOOOOO

* icons my hated

* fix for mods / spaceproof shit

* holy shit whhhyyyyy

* backpack first

* Update mod_theme.dm

* prevent infinite gun arms / infinite modsuit cores / syndicate modules

* fixes tm error

* scream loudly if species sprites break. They shouldn't, but, you know.

* deconflicted with luck

* converts to refit for species

* fix pathfinder

* fixes modsuits being funky power wise

* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit

* nerfs the atmos modsuit

* magboots for ds / CC modsuit

* downside of autosave: typing in wrong window saves bad stuff

* Gamma ERT have internal cameras again.

* spellcheck when

* ah fuck

* yes delete the null that works

* whoops

* fixes error / description

* un vulps your cannon

* fixes tails disapeering on base modsuits

* space to underscore

* tgui fix / tajaran

* springlock buff, cryopod fix

* u helps

* WHO PUTS A GUN IN ITEMS

* tgui moment

* mining modsuit nerf / hidden holster module

* PAIN

* UNATHI TIDE STATION WIDE

* I love special code

* slightly dense

* shark jumpscare

* fixes ghost item, fixes springlock being bad

* YIPPEEEE IT WORKED

* she decons my flict

* pain

* ebbas days are numbered :^)

* hidden

* r-r-r-ebuild

* fixes more bugs

* qwerty, you are dense

* fixes gps

* fix mulebot crate

* level fix

* adds back icon

* moving storage, fix bug, modules activate / deactivate message

* yeah

* yeah

* yeah™️

* steels requests

* windoors no longer make pathfinder module explode

* chat spam

* oil slicks + modsuits

* whoops

* bag check

* ofc

* Update code/modules/mod/mod_control.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_nuclear.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mod/mod_control.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mod/modules/module_pathfinder.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-19 15:36:13 -05:00
Kano
4d916b8f7e Adds a new space ruin: Wrecked Cargoship (#21876)
* Adds a new space ruin.

* Update code/datums/ruins/space_ruins.dm

lewcc's review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* id_tag fix

* thanks StrongDMM

* guess who can't place '"' properly

* additions and fixes (i hope)

* the one commit to pass all CI checks

* defined in config

* removed an illegal placement of a railing

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 20:19:46 +01:00
Luc
b7f0f60364 Adds some fresh new emotes (#21828)
* Adds some fresh emotes

* Adds necessary keybinds

* oops

* to_chat moment

* but here's the Thing

* Update code/modules/mob/living/carbon/human/human_emote.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Add missing name

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-08-16 20:04:11 +01:00
DGamerL
b0b347660e The Rapid Syringe gun now costs 12 TC. It can also pierce all clothing now. (#21674)
* RATATATATATA

* We use TRUE, not 1

* making it cost 12

* making progress

* FINALLY

* Lewcc review

* Whoops this too

* Lewcc review

* Might work, might not, but conflict time

* Henri review
2023-08-16 19:52:02 +01:00
Silverplate
ff909adfb1 Adds Species Unique Traitor Gear (ready for review edition) (#21313)
* Vars and ideas

* Adds supercharge implant

* species specific tot gear!

* Adds vox spikethrower

* Adds Love injecting pen (skrell)

* sprite issue fix

* typographical error.

* makes pen not refillable, pacifies

* Adds fireproofing nanite injector (plasmaman)

* Lower KD on spikethrower per qwerty

* Lewcc review

* aaaa so much space indentation

* steelslayer review

* Steelslayer review

* Lewcc reviews

* Changes the spans

* Lewc review, Thanks to DG for doing my PR for me.

* Update code/modules/projectiles/guns/energy/special_eguns.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Henri review

* Forgot this one

* Whoopsie number 2

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 19:25:25 +01:00
JimKil3
58f2d4b185 da fix (#21961) 2023-08-12 19:33:46 +01:00
GDN
a4010a9525 buffs the mind batterer (#21758) 2023-08-12 18:54:19 +01:00
JimKil3
eb69f11a1b Adds RTS-like camera controls to AI (#21625)
* REMOVES sillycons (their keybinds)

* adds the feature

* comment fix

* mech fix

* lewcc review
2023-08-12 18:38:10 +01:00
GDN
e8ead6267b item actions can be used while horizontal (#21866) 2023-08-12 18:25:12 +01:00
matttheficus
32e023b85e Adds Basic Observer Outfits for Admin/Testing Use (#21846)
* admin outfits

* swap to bag

* space oopsie

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* contra + lewcc reviews

* copy paste moment

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-08-12 18:23:53 +01:00
Fridge Burns
2f711fb321 Screwdrivers can now be recycled in autolathes (#21629)
* screwdriver can be put into autolathe

* Redundant and misspelt  comment

* minutia

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* add COMSIG_TOOL_ATTACK

* tools can be inserted on harm intent

* use signal to allow screwdriver to be inserted into the autolathe

* accidental spaces

* parenthesis for clarity

* snake_case 1

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* snake_case 2

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* dont direct istype check the screwdriver

* . defaults to null

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* add SIGNAL_HANDLER to the proc that handles a signal

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-08-12 18:21:17 +01:00
Henri215
4398e2c003 Fixing common spelling mistakes part 4 (#21945) 2023-08-10 17:27:20 -05:00
Qwertytoforty
4e96730cae [s] fixes a bug (#21939)
* REAL PAIN. REAL SUFFERING. REAL GOD WHY AAAAA.

* more space per space
2023-08-10 17:10:25 -05:00
Contrabang
aa655db473 Improves /datum/component/sticky code (#21836)
* sticky code improvements

* we want it like this

* steel review

* Update code/datums/components/sticky.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-07-31 14:36:46 -05:00
Baredolf
ed08e46fea Removed "die" from the list of forced objectives (#21786)
Co-authored-by: Baredolf <Baredolf@users.noreply.github.com>
2023-07-27 20:36:38 -05:00
GDN
067ce5670e removes uses of << sound, replaces with send_sound (#21774)
* removes uses of << sound, replaces with send_sound

* readds sound wrappers
2023-07-27 15:57:04 +01:00
K3Licia
e6b3c5fba7 New Tajaran Emotes (#21296)
* Delete human_emote.dm

* Add files via upload

* Add files via upload

* Update human_emote.dm

* Update human_emote.dm

* Update human_emote.dm

* Update human_emote.dm

* Update human_emote.dm

* Update human_emote.dm

* Update emote_keybinds.dm

* Update human_emote.dm

* Update emote_keybinds.dm

* Update emote_keybinds.dm

* Fixing CL error in emote_keybinds.dm

* once AGAIN fixing cl error
2023-07-27 15:01:49 +01:00
Contrabang
ba7ff8b3b0 Fixes 9000+ runtimes with the camera bug because I'm an idiot (#21835)
* bruh

* better comment
2023-07-26 21:27:34 +01:00
Contrabang
17a4df5a4c Fixes some issues with command and sec job lists (#21806)
* oh god oh god

* oops, forgot to remove that

* name changes
2023-07-24 14:24:09 -05:00
matttheficus
15c5acd05c Adds the Prototype Freedom Implant (#21759)
* FREEEEEEEEEEEEEEEEEEEEDOM

* stop showing everyone i copy paste my code smh
2023-07-24 15:53:54 +01:00
Charlie
5ccd8241c4 homing projectiles + wizard spell (#21752) 2023-07-24 15:52:17 +01:00
matttheficus
f48693ef4c Adds Fragmentation Grenades to the Uplink (#21726)
* boom boom pow

* ctrl + c / ctrl + v is bad
2023-07-24 15:42:11 +01:00
Contrabang
f06f209f92 Revolutionaries now have a grace periods from attacks after beating deconversion (#21716)
* deconversion help

* scuffed?
2023-07-24 15:38:48 +01:00
GDN
d907f0610e Clown is slippery and the mime has no footsteps (#21675)
* Clown is slippery and the mime has no footsteps

* bam
2023-07-24 15:28:51 +01:00
JimKil3
bcea9d3377 Cryogenic anomalies & armor (#21603)
* cryogenic anomaly

* sprite

* reactive gelidic armor

* america number 1 raaah

* sprite (thanks atp)

* qwerty suggestion

* floor freezing

* Update code/game/objects/effects/anomalies.dm

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

* steel review commit 2

* whitespace apparently? idk

* whitespace fix (real)

* vetus

* Update code/game/objects/effects/anomalies.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/effects/anomalies.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/effects/anomalies.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* early return thing

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-24 15:11:21 +01:00
Coolrune206
273438330b makes the chameleon projector cheaper (#21712) 2023-07-23 23:33:13 +01:00
Contrabang
01889aae10 Buffs the Camera bug by adding hidden cameras (#21618)
* LETS GOOOOOo

* desc

* steel review

* ASYNC MAGIC!

* lewcc review

* i cant spell

* async
2023-07-23 23:28:56 +01:00
JimKil3
86874ce415 Adds the titanium push broom, a janitor-exclusive traitor item (#21496)
* adds it

* fixes the thing

* !! scope size increasing !!

* trait rename

* surplus removing

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* code review commit 2

* fixes a minor issue

* check_grep please have mercy

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-23 23:28:24 +01:00
Octus
912d444d07 Removes Vox... Armalis, yes the other vox we forgot about (#21519)
* youtube 2008 die sound effect

* I take pride in my work

* noisecannonsbegone

* armalis clothing shit
2023-07-23 20:14:27 +01:00
Venuska1117
4beab5e48f Space: Space Bar Rework (#21710)
* NanoMap Auto-Update (Sun Jul  2 02:02:08 UTC 2023)

* new space bar look, lets goo

---------

Co-authored-by: NanoMap Generation <action@github.com>
2023-07-22 11:19:09 +01:00
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
GDN
6ffbe49973 stamina damage logging (#21576)
* stamina damage logging

* use a gun

* bam
2023-07-17 15:21:28 +01:00
GDN
4c1144db1d readds the mind batterer, fully reworked (#21193)
* readds the mind batterer, fully reworked

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* moer changes

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

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

* sean review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-07-17 14:57:25 +01:00
larentoun
297e268b15 [FEAT] Battlemage Bundle now contains wizard magboots! (#21671)
* feat: Battlemage Bundle now contains wizard magboots!
https://github.com/ss220-space/Paradise/pull/1061

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-07-17 10:57:00 +01:00
GDN
b98db1d554 plasmamen detectives now spawn with bowman headsets (#21641) 2023-07-17 10:55:38 +01:00
Contrabang
4bcb907e91 Gloves of the North Star now allow Martial Arts (#21545)
* gotns

* uplink desc changes

* gdn review + M to L
2023-07-17 10:48:17 +01:00