Commit Graph

104 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
Ghommie
d9636398e1 Fixes implant pads 2019-11-29 20:12:10 +01:00
kevinz000
dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -07:00
Ghommie
91625b6e60 item/doMove() calling dropped() callign qdel(src) because of DROPDEL. 2019-11-02 14:15:31 +01:00
Ghommie
874cdfefb8 fixing storage implant transplant. 2019-11-02 14:03:14 +01:00
Ghommie
b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
7e3a812460 Fixing tracking implant teleport issues. 2019-10-15 21:32:01 +02:00
Ghommie
b95f910a4e macros 2019-10-07 17:32:16 +02:00
Ghommie
5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP 2019-10-07 05:25:47 +02:00
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
YakumoChen
06d9dd8a52 !
Box no longer a damage sponge, deletes in one hit
2019-07-26 23:55:43 +00:00
Ghommie
fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
kevinz000
8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
deathride58
8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
2019-06-08 01:07:56 -04:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00
kevinz000
8cd0b69b61 adrenals 2019-05-28 01:00:41 -07:00
JTGSZ
080b29de79 Solves a few things. 2019-05-23 00:40:57 -04:00
Ghommie
2b668a8b7c activated = FALSE 2019-05-21 23:12:23 +02:00
Ghommie
ab9bde1b15 reverts Lily. 2019-05-21 22:55:49 +02:00
Ghommie
20124c24ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-05-21 22:48:59 +02:00
Ghommie
5e4bbb0d02 Awaken, code. 2019-05-21 22:45:59 +02:00
kevinz000
55dca0bd41 Merge pull request #8139 from Trilbyspaceclone/patch-82
Makes mind shields bomb proof
2019-05-21 00:00:28 -07:00
Useroth
5d8cf0cabe Let's give adrenals the one more small touch of love. 2019-04-28 16:13:07 +02:00
Useroth
8ab82e0853 Fixed two leftovers from a feature that I will do in another PR. 2019-04-28 06:23:36 +02:00
Useroth
56b2e7150c Back to the point of entry. 2019-04-28 06:21:03 +02:00
Useroth
41a8177f34 Adjustments v2. 2019-04-27 13:53:04 +02:00
Useroth
c1ffffa4f1 Adjustments. 2019-04-27 13:50:23 +02:00
Useroth
9c17845e0f Buffed changeling adrenals too. 2019-04-26 21:34:50 +02:00
Useroth
3563fef4c0 Makes adrenals work pretty much like they used to pre combat rework. 2019-04-26 16:47:31 +02:00
Ghommie
ced2ee0ad0 Painbow extract. Cluwne. 2019-03-19 14:48:35 +01:00
Ghommie
a537c12757 Apply some pressure, you lose some pressure 2019-03-19 12:29:26 +01:00
Trilbyspaceclone
d33b57031f Update implant_mindshield.dm 2019-03-18 21:00:50 -04:00
kevinz000
47d0cc7b1b Update implant_mindshield.dm 2019-01-04 22:02:22 -08:00
Poojawa
7d300117af literally everything Bhjin has been complaining about
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
b604390f33 Ports tgstation/tgstation#39302 with adjustments, see desc of commit (#7424)
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00