Commit Graph

3446 Commits

Author SHA1 Message Date
r4d6
e17d32199d update 2019-12-23 13:30:42 -05:00
r4d6
54b3e3603e update (#3)
* testing, further improvements. Tired.

* FLAK

* Automatic changelog generation for PR #9971 [ci skip]

* Update preferences.dm

* Automatic changelog generation for PR #9736 [ci skip]

* this cannot go wrong

* oop

* Changes required to enable for maintenance protocols

All combat mechs that are special get their internals_access increased so the pilots of the deathsquad / nuke team can fix up their mechs without having to steal a robotics ID. Also removes engineering from being able to access mech internals, seems weird to have if only robotics is allowed to handle mechs, probably remnant of engineering robotics?

* Automatic changelog generation for PR #10115 [ci skip]

* Port boops and handshakes

* Update code/modules/mob/living/carbon/carbon_defense.dm

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon_defense.dm

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* AAAAA

* Add a nose boop sound

* Add a boop sound effect

* Make the boop louder.

* Fixes pubby wall meds being var-edited snowflakes.

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Fixes AI being unable to talk through the holopad.

* Travis had a stroke.

* ports "Standardize obj/updateicon() and update_icons() to update_icon()"

* Update supply.dm

* Update code/modules/vending/cola.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Brings carbon action intent hotkeys down to living.

* Update drink_reagents.dm

* Automatic changelog generation for PR #10180 [ci skip]

* Automatic changelog generation for PR #10181 [ci skip]

* Porting a few martial art code updates.

* Adds gas miners to all maps.

* Compress secK9

* whoops

* Hopefully this won't screw up travis.

* Two slimepeople fixes.

* Automatic changelog generation for PR #10072 [ci skip]

* Automatic changelog generation for PR #10225 [ci skip]

* Update drink_reagents.dm

* Automatic changelog generation for PR #10203 [ci skip]

* Automatic changelog generation for PR #10157 [ci skip]

* Automatic changelog generation for PR #10155 [ci skip]

* Automatic changelog generation for PR #10111 [ci skip]

* Automatic changelog generation for PR #10216 [ci skip]

* Automatic changelog generation for PR #10172 [ci skip]

* Automatic changelog generation for PR #10026 [ci skip]

* Automatic changelog generation for PR #10076 [ci skip]

* Update drinks.dm

* Automatic changelog generation for PR #10153 [ci skip]

* ??

* Update snacks.dm

* oops

* probably fixes only neutral traits existing

* Automatic changelog generation for PR #10227 [ci skip]

* argk

* Chef buffs chef buffs tastier food.

"The strong flavor of" was always in game but someone put it behind an else if statement that would never proc.
Now if there's more than 45% (or 30% if you are a lizzard, hissss) of a reagent in a beaker, you will taste a strong flavor! 
Hurrah!

* Automatic changelog generation for PR #10228 [ci skip]

* fixes the sprites

* Actually hold on

So that not everything in the game now tastes like STRONG FLAVOUR. That'd be annoying.

* Magic number man bad, also all heads can spam CC now

* im baby dumb and removed "a hint of" by accident.

Okay whoops haha there we go now both strong and weak should work.

* oh hey macros.

slightly less ugly ™

* modular man bad.

now mörge this so chefs can make delicious dish, hemk.

* Update carbon.dm

* lolman acctually knows how the stuff work

* AAAAAAAAAAAAAAAAAAAA

* Update flashbang.dm

* thank you based ghomtainer (when)

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* thank you based ghomtainer (when) 2x how did i not notice this

* Automatic changelog generation for PR #10204 [ci skip]

* Converts the main timsorts file from relative pathing to absolute pathing.

* Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly"

* wew

* Automatic changelog generation for PR #10090 [ci skip]

* Add the sprite for the landmark

* Make it include my files

* Automatic changelog generation for PR #10067 [ci skip]

* Automatic changelog generation for PR #10160 [ci skip]

* drop

* Automatic changelog generation for PR #10079 [ci skip]

* Automatic changelog generation for PR #10207 [ci skip]

* Automatic changelog generation for PR #10214 [ci skip]

* Update mob.dm

* Update mob.dm

* Redo my changes on Box

Hopefully this will fix the conflict with the fire alarms.

* h

* Automatic changelog generation for PR #10193 [ci skip]

* I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive?

* Automatic changelog generation for PR #10054 [ci skip]

* Automatic changelog generation for PR #10126 [ci skip]

* Automatic changelog generation for PR #10142 [ci skip]

* Automatic changelog generation for PR #10051 [ci skip]

* Automatic changelog generation for PR #9925 [ci skip]

* Automatic changelog generation for PR #9563 [ci skip]

* Atomises out the magicnumber change

* Automatic changelog generation for PR #10231 [ci skip]

* Automatic changelog generation for PR #10235 [ci skip]

* Automatic changelog generation for PR #10200 [ci skip]

* Fix the nose boop.

* Remove extra indentations

* Update inhand_holder.dm

* hhh

* ghom help

* ff

* ff

* Automatic changelog generation for PR #10058 [ci skip]

* Automatic changelog generation for PR #10059 [ci skip]

* Automatic changelog generation for PR #9596 [ci skip]

* Automatic changelog generation for PR #9940 [ci skip]

* Automatic changelog generation for PR #10232 [ci skip]

* Automatic changelog generation for PR #10141 [ci skip]

* Begone crap.

* I gotta go fast.

* QoL Update

Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.

* Magic number baaad

* Make things even more organized

* Better safe than sorry.

* Automatic changelog generation for PR #10164 [ci skip]

* Automatic changelog generation for PR #10120 [ci skip]

* Automatic changelog generation for PR #10257 [ci skip]

* typo

* Unnecessary OOC note.

* Is merging someone else's PR you personally fixed considerable as self-merging?

* I'm playing dirty because we have too many PRs to merge anyway.

* Automatic changelog generation for PR #10096 [ci skip]

* Automatic changelog generation for PR #9950 [ci skip]

* Automatic changelog generation for PR #10190 [ci skip]

* Automatic changelog generation for PR #9830 [ci skip]

* Suggestions

* Fix indentation

* lowered to 10 after i struggled to open tickets panel

* FUUUUUUUUUUUCK

* Nerfs fun

* FUUUUUUUUUCK v2

* Automatic changelog generation for PR #10263 [ci skip]

* QoL Update

- Rename the cameras and place two more

- Unanchor the shields generators and emitters because they were bugged and will save more time

- Put more rad closets on the Singulo

- Put more insuls on the Tesla since they protect

- Moved the Engineer clothing locker to Boxstation instead of having it in the Engine

- Added a button to the shutters on the north side of PA

- Added a marker to show where to place the console

- Rewire the power wire to be more in a straight line.

* Forgot a "

* Forgot a button on the Tesla

* Update supply.dm

* readds sprites

* Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.

* Connect the fuel pipe to somewhere

* no more 40% time dilation

* Update __donator.dm

* Update modular_citadel/code/modules/client/loadout/__donator.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update modular_citadel/code/modules/client/loadout/__donator.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update modular_citadel/code/modules/client/loadout/__donator.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update custom_items.dm

* Automatic changelog generation for PR #10254 [ci skip]

* Fix areas and tiles getting ripped off

* Also give Tesla's emitters R-floors

* Automatic changelog generation for PR #10093 [ci skip]

* Automatic changelog generation for PR #10210 [ci skip]

* Automatic changelog generation for PR #10246 [ci skip]

* Update custom_items.dm

* Automatic changelog generation for PR #10218 [ci skip]

* Automatic changelog generation for PR #10274 [ci skip]

* Add the option to restrict the Engine that spawn

* Revert "Add the option to restrict the Engine that spawn"

This reverts commit e3e1f91635.

* Revert "Revert "Add the option to restrict the Engine that spawn""

This reverts commit d851beea16.

* Add config options

* Move the config up to avoid conflict

* Automatic changelog generation for PR #10245 [ci skip]

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: Lin <linzolle@gmail.com>
Co-authored-by: kappa-sama <44128284+kappa-sama@users.noreply.github.com>
Co-authored-by: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: BlackMajor <henrydyer6@hotmail.com>
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Co-authored-by: GrayRachnid <Gray_icy@hotmail.com>
Co-authored-by: B1gb3ast <Yeremyrus@live.nl>
Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com>
Co-authored-by: nik707 <38332985+nik707@users.noreply.github.com>
Co-authored-by: LetterJay <9606363+LetterJay@users.noreply.github.com>
2019-12-23 13:29:44 -05:00
r4d6
dbf3e7d246 Add the landmarks 2019-12-19 15:27:45 -05:00
Lin
a91139c470 Merge pull request #10068 from Ghommie/Ghommie-cit433
Ports "Makes the windup toolbox more similar to His Grace".
2019-12-07 21:52:10 +00:00
Lin
24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
2019-12-07 21:49:18 +00:00
Ghommie
99f694c94a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit433 2019-12-06 15:31:40 +01:00
Ghommie
622b3e5608 ddddddd 2019-12-06 15:31:05 +01:00
Winter Flare
8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:27:44 -05:00
Winter Flare
b860c6e0bb Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:14:44 -05:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
kevinz000
8cb6ff10b8 Merge pull request #10034 from Ghommie/Ghommie-cit420
Fixes the incongruent bone satchel description.
2019-12-05 22:00:38 -07:00
kevinz000
e16b61b865 Merge pull request #10043 from Arturlang/patch-1
PDA cartridges and their contents can no longer be contaminated
2019-12-05 21:58:33 -07:00
kevinz000
b8bb0f2924 Merge pull request #10048 from Ghommie/Ghommie-cit426
Demodularize moodlets.
2019-12-05 21:56:29 -07:00
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000
a65588009c Merge pull request #10038 from Trilbyspaceclone/patch-240
Makes trash carts craftable with plastic
2019-12-05 21:51:30 -07:00
kevinz000
13f43eb783 Merge pull request #10045 from Trilbyspaceclone/patch-241
Makes wallets hold more stuff
2019-12-05 21:49:50 -07:00
kevinz000
b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-12-05 21:47:29 -07:00
kevinz000
5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
kevinz000
e2f9a68c2c Merge pull request #10049 from Useroth/new-tg-plants
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
kevinz000
d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
2019-12-05 21:33:12 -07:00
kevinz000
70d305611c Merge pull request #10042 from Ghommie/Ghommie-cit422
fixes sofa overlays doing nothing, because their layer wasn't properly set.
2019-12-05 21:28:24 -07:00
kevinz000
29497320c1 Merge pull request #10025 from Linzolle/butchering
refactor butchering component
2019-12-05 21:19:57 -07:00
Ghommie
d3d1116094 null = n_color, no. 2019-12-06 03:59:51 +01:00
Ghommie
2528714035 I have no liability about glowing robotic eyes not automatically updating right here. 2019-12-06 03:56:48 +01:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Useroth
2e84c30e59 Tiny touch-ups 2019-12-05 16:29:50 +01:00
Useroth
950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00
Ghommie
77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
Arturlang
138847838a I suppose 2019-12-04 21:17:49 +02:00
Trilbyspaceclone
2a591df09a Update wallets.dm 2019-12-04 12:50:18 -05:00
Trilbyspaceclone
8ecb920c7f Update bins.dm 2019-12-04 12:20:24 -05:00
Arturlang
7d3103a260 Done 2019-12-04 15:02:36 +02:00
Ghommie
3d7ef827a9 better. 2019-12-04 06:31:48 +01:00
Ghommie
dc91114e8b fixes sofa overlays doing jackshit, because their layer wasn't properly set. 2019-12-04 06:26:11 +01:00
TrilbySpaceClone
e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
kevinz000
d578bbd10a Merge pull request #10021 from Putnam3145/rld-fix
Makes glowsticks no longer radioactively contaminable.
2019-12-03 19:53:18 -07:00
Trilbyspaceclone
aa3598f166 less dope 2019-12-03 19:51:19 -05:00
Trilbyspaceclone
0b90def435 Update sheet_types.dm 2019-12-03 19:43:31 -05:00
Ghommie
3fb485c721 Fixes the incongruent bone satchel description. 2019-12-03 22:39:07 +01:00
Ghommie
3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Lin
b501321362 Merge pull request #9941 from Putnam3145/personal-closet-fix
Personal closets can use PDAs/tablets now
2019-12-03 01:38:42 +00:00
Lin
99e9c7299e Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
2019-12-03 01:30:51 +00:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145
af31fe12c7 Merge pull request #9976 from Ghommie/Ghommie-cit405
Ports "Fixes transit tube barricade spam"
2019-12-01 23:07:53 -08:00
Putnam3145
c5c52caf2e Merge pull request #10010 from Ghommie/Ghommie-cit415
Fixes implant pads and updates them a little (WHY THE HELL DO WE STILL HAVE THIS OLDCODE CRAP LINGERING AROUND?)
2019-12-01 13:43:21 -08:00
Linzolle
19b004edab update butchering 2019-12-01 14:35:11 -06:00
Putnam
010bee19f4 damn you feasel 2019-12-01 00:22:15 -08:00
Putnam3145
1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
2019-11-30 22:51:42 -08:00
Putnam3145
44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
deathride58
b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00