Commit Graph

13933 Commits

Author SHA1 Message Date
Ghommie
d571bbd292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-24 00:07:32 +01:00
r4d6
7e8581ae88 Merge remote-tracking branch 'upstream/master' 2019-12-23 15:40:02 -05:00
Ghommie
864b768c67 Fixes digitigrades. 2019-12-23 19:36:47 +01:00
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
Ghommie
e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Ghommie
14c73b7d01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 14:21:08 +01:00
Ghom
37a6abd889 Merge pull request #10274 from kappa-sama/kappa-sama-patch-1
no more 40% time dilation from broodmother
2019-12-23 13:41:10 +01:00
Putnam
13a8efe616 no assassination at all (!!) on calm 2019-12-23 00:43:25 -08:00
Ghommie
187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
Ghommie
d88f50ac15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-23 05:02:31 +01:00
Seris02
382c5d057a updates ratvar coat 2019-12-23 12:02:05 +08:00
Ghommie
b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghom
db2a108b4a Merge pull request #10246 from Citadel-Station-13/kevinz000-patch-129
Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag
2019-12-23 03:25:27 +01:00
Ghom
3635525c56 Merge pull request #10210 from Citadel-Station-13/kevinz000-patch-127
Cargo shuttle now silently leaves behind slaughter demons + revenants
2019-12-23 03:13:31 +01:00
Ghom
f3936f2c81 Merge pull request #10093 from Trilbyspaceclone/donut
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
2019-12-23 02:31:50 +01:00
kevinz000
6157cb0042 Merge pull request #10254 from r4d6/patch-1
Fix the nose boop
2019-12-22 14:03:02 -08:00
Putnam
801c789419 made toggle more indicative 2019-12-22 13:14:49 -08:00
kappa-sama
994cd753d5 no more 40% time dilation 2019-12-22 14:39:36 -05:00
Ghommie
0b96e469dd Oh shit. 2019-12-22 13:07:37 +01:00
Ghommie
9034980871 randomized recipes fallback fix. 2019-12-22 12:58:11 +01:00
Ghommie
757af250cf Fix goose meat. 2019-12-22 12:21:11 +01:00
Ghommie
4fbd9fdca0 Effectively removes the long unrequired roboticist encryption key. 2019-12-22 12:02:15 +01:00
kevinz000
f39d12527d Update supply.dm 2019-12-21 23:50:59 -08:00
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Seris02
d6727bce64 woops 2019-12-22 12:26:42 +08:00
Seris02
18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08:00
Trilbyspaceclone
f5a55aaecf Nerfs fun 2019-12-21 21:09:22 -05:00
Lin
37a0f0d7e6 Merge pull request #10241 from Ghommie/Ghommie-cit482
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
2019-12-21 22:44:09 +00:00
kevinz000
86074ae6b1 lowered to 10 after i struggled to open tickets panel 2019-12-21 14:33:02 -08:00
Ghom
31ba9fe4a8 Revert "Makes HE pipes realistically radiate away heat" 2019-12-21 22:43:26 +01:00
Trilbyspaceclone
0b63e79098 Merge branch 'master' into glassware 2019-12-21 15:41:45 -05:00
Ghom
6b2fe333f4 Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture
Stun warfare rebalance - CBT edition
2019-12-21 19:02:00 +01:00
Ghom
a33065a728 Merge pull request #10190 from Trilbyspaceclone/honeysoda
The new buzz around the new soft drink
2019-12-21 18:34:35 +01:00
Ghommie
395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Ghom
2b2a3c2721 Merge pull request #9950 from Citadel-Station-13/marauder-nerf-1
Nerfs the Clockwork Marauder meta
2019-12-21 17:26:04 +01:00
Ghom
2bc401e2d2 Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
nanites can no longer spread through atmospherics-blocking objects
2019-12-21 16:48:56 +01:00
Ghom
2a76743747 I'm playing dirty because we have too many PRs to merge anyway. 2019-12-21 16:42:27 +01:00
Ghom
5c3d3f4cc5 Is merging someone else's PR you personally fixed considerable as self-merging? 2019-12-21 16:40:32 +01:00
Ghom
daf099388e Unnecessary OOC note. 2019-12-21 16:37:28 +01:00
Ghom
4624a1739a typo 2019-12-21 16:30:02 +01:00
Ghom
aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision
Night vision trait but it just boosts barely-lit visibility
2019-12-21 15:30:32 +01:00
Ghom
a384b1782b Merge pull request #10164 from kappa-sama/martialartist
What ho, Muscle Wizard! Might you cast us a spell?
2019-12-21 15:24:06 +01:00
Michiyamenotehifunana
3920e6a38d Merge remote-tracking branch 'upstream/master' into polyshorts-for-digis 2019-12-21 22:22:12 +08:00
Michiyamenotehifunana
0b2568a9cf Modernizes Polychromic Uniform Code
No more modular_citadel, but the neck polychrome crap needs more work in another PR
2019-12-21 21:38:04 +08:00
Ghom
f30be0ace6 Merge pull request #10077 from ForrestWick/uplinkchanges
Moves brainwash surgery from role restricted to devices and tools in the uplink
2019-12-21 12:43:18 +01:00
Ghom
19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
Ghom
a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
2019-12-21 11:05:36 +01:00