Commit Graph

1977 Commits

Author SHA1 Message Date
deathride58
f5cbfd1c52 Merge pull request #6577 from Citadel-Station-13/upstream-merge-36839
[MIRROR] Deactivate suicide prescans via ghost var
2018-05-02 14:25:32 +00:00
deathride58
a84f5c5328 Merge pull request #6608 from Citadel-Station-13/upstream-merge-37516
[MIRROR] Changes the trauma formula so constant small ticks don't keep triggering traumas
2018-05-02 01:30:00 +00:00
deathride58
8f00bca017 Merge pull request #6598 from Citadel-Station-13/upstream-merge-37477
[MIRROR] Makes dizziness work again
2018-05-02 01:25:46 +00:00
deathride58
e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165
[MIRROR] NTNet improvements!
2018-05-02 01:17:10 +00:00
Jordan Brown
453bd38ca5 Merge pull request #37516 from XDTM/LinearBrainDamage
Changes the trauma formula so constant small ticks don't keep triggering traumas
2018-05-01 09:56:39 -05:00
Alomga
90ecbf6bb9 Makes dizziness work again 2018-04-30 13:38:12 -05:00
LetterJay
34ce5380d6 Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500
[MIRROR] Removed /obj/item/asteroid path
2018-04-30 11:03:16 -05:00
ShizCalev
3160d7771d Removed /obj/item/asteroid path (#37500)
* Cleans up some item paths

* removed kebab
2018-04-30 04:57:09 -05:00
Mickyan
01e4304326 Makes nutrition level show up on self-inspect (#37509)
* Makes nutrition level shows up on self-inspect

* Changed to switch statement, edited flavor text
2018-04-30 00:17:59 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
george99g
0a02d1cb13 Deactivate suicide prescans via ghost var 2018-04-29 21:33:56 -05:00
kevinz000
6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
AnturK
b8bb30d3de Removes some unused code. (#37449) 2018-04-27 10:33:10 -05:00
deathride58
d2fbb671ba Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498)
* adjuststaminabuffer() now drains borg cells, borgs can now sprint, removes aiming down sights, combat mode now makes you face your cursor

* forgot to ctrl+s here
2018-04-27 07:41:31 -07:00
deathride58
862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276)
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
2018-04-27 07:40:45 -07:00
deathride58
28dd1a28ab Merge pull request #6528 from Citadel-Station-13/upstream-merge-37439
[MIRROR] admins can now var edit the sound frogs make when they are stepped on
2018-04-27 09:41:14 +00:00
deathride58
f8406d1bfe Merge pull request #6507 from Citadel-Station-13/upstream-merge-37375
[MIRROR] fixes cqc working outside chef assigned areas
2018-04-27 09:31:04 +00:00
Armhulen
da1ac395c2 ok! (#37439) 2018-04-27 02:28:13 -05:00
LetterJay
d679d27766 Merge pull request #6505 from Citadel-Station-13/upstream-merge-37378
[MIRROR] Fixes brain tumor. Again.
2018-04-27 00:12:14 -05:00
kevinz000
42d0541a28 fixes cqc working outside chef assigned areas (#37375)
* cqc

* Update martial.dm

* Update cqc.dm

* Update cqc.dm

* Update human_defense.dm

* Update human_defense.dm

* Update human_defense.dm
2018-04-24 10:23:34 -05:00
AnturK
1ba045e5f5 Fixes brain tumor. Again. (#37378) 2018-04-24 09:58:36 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa
832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
LetterJay
de2ab536d1 Merge pull request #6477 from Citadel-Station-13/upstream-merge-37320
[MIRROR] Fixes pAI's breaking drone static.
2018-04-22 22:21:45 -05:00
LetterJay
7f90eaf89c Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270
[MIRROR] [READY] A few additions, tweaks, and fixes for integrated circuits
2018-04-22 22:19:28 -05:00
AnturK
e36c44be5c Fixes pAI's breaking drone static. (#37320) 2018-04-22 19:19:43 -05:00
LetterJay
8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-22 02:44:56 -05:00
LetterJay
e30d3540b1 Merge pull request #6437 from Citadel-Station-13/upstream-merge-37214
[MIRROR] Fixes adjusting brain damage.
2018-04-22 02:42:13 -05:00
SailorDave
187fb97388 [READY] A few additions, tweaks, and fixes for integrated circuits (#36270)
* A few additions, tweaks, and fixes for integrated circuits, and some very minor tweaks to hydroponics and carbon/silicon examine() to support those changes.

🆑 SailorDave
rscadd: A new manipulation circuit, the Seed Extractor. Extracts seeds from produce, and outputs a list of the extracted seeds.
rscadd: A new list circuit, the List Filter. Searches through a list for anything matching the desired element and outputs two lists: one containing just the matches, and the other with matches filtered out.
rscadd: A new list circuit, the Set circuit. Removes duplicate entries from a list.
tweak: The Plant Manipulation circuit can now plant seeds, and outputs a list of harvested plants.
tweak: Reagent circuits can now irrigate connected hydroponic trays and inject blood samples into Replica pods.
tweak: The Examiner circuit outputs worn items and other examined details of carbon and silicon mobs into the description pin.
tweak: List Advanced Locator circuit now accepts refs as well as strings.
bugfix: Fixed the Power Transmitter circuit not properly displaying a message when activated.
bugfix: Medical Analyzer circuit can now properly scan non-human mobs.
/🆑

Additional details:
- Plant Manipulation: obj/item/seeds harvest() proc and obj/machinery/hydroponics attack_hand() procs were adjusted slightly to allow this, returning a list when harvested.

- Seed Extractor Module: obj/machinery/seed_extractor /proc/seedify() was adjusted to return a list of seeds.

- Hydroponics replica pod was adjusted to be injectable|drawable, and use reagents and on_reagent_change() rather than a hardcoded attackby(), so other injection methods can use it to allow blood sampling/future reagent reactions regardless of type.

- IC Examiner Module returns a list of examine() messages from mob/living/carbon, mob/living/carbon/human, mob/living/carbon/silicon, and mob/living/carbon/silicon/ai in the description data pin, rather than outputting null since they had an empty desc var. The relevant examine procs were adjusted to return their messages.

 - IC get_data() and set_pin_data() adjusted to return text/num properly and to WEAKREF/un-WEAKREF the contents of passed lists.

* fixes errors from screwy merge conflicts and replaces illegal proc name

* re-added a traits tag that accidentally got removed

* review changes

* plant analyzer outputs irrigation status and connected trays, search circuit uses 2 Cx down from 6

* examiner outputs the occupied turf of the examined object and can also scan turfs

* string inputs on circuit pins now use multiline input; fixed edit/remove not working on list pins; fixed large screens not outputting visible messages when held

* locomotion now has a cooldown of 0.1sec and their complexity + pathfinder complexity reduced

* assemblies can open doors they have access to from a card reader through collision

* Merge master branch; fixes pathfinder AStar runtime; fixes tile pointer; fixes material manager self-ref; various grammar touchups

* review changes

* fixes improper weakref type checking

* fixes seed extractor merge confict, removes unnecessary weakref change

* dang ol merge undoing my changes HECK

* updated to robbym's tile pointer PR with clearer var names

* added missing "not scanned" results to tile analyzer, removes duplicate circuit entries(???? how)
2018-04-22 02:31:10 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-18 11:34:06 -05:00
vuonojenmustaturska
d2b4b6d2f0 Merge pull request #37214 from AnturK/imighthavebraindamage
Fixes adjusting brain damage.
2018-04-16 07:39:54 -05:00
vuonojenmustaturska
ed201bc65d Gives mining bots back their mesons (#37196)
* Gives mining bots back their mesons

* qdel
2018-04-16 04:36:40 -05:00
deathride58
f98040513a Merge pull request #6383 from Citadel-Station-13/upstream-merge-37113
[MIRROR] Adds an period to point messages
2018-04-16 03:05:00 +00:00
deathride58
8110227bc3 Update living.dm 2018-04-15 22:46:55 -04:00
Jordan Brown
78f89423fe Merge pull request #37156 from ExcessiveUseOfCobblestone/patch-38
Stops silicons looping through world every login looking for flippin runes
2018-04-14 21:47:49 -05:00
ShizCalev
bc8c97d6c4 Adds an period to point messages 2018-04-12 06:38:04 -05:00
deathride58
b4ecb3ef27 Merge pull request #6343 from Citadel-Station-13/upstream-merge-36670
[MIRROR] Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful
2018-04-11 21:37:24 +00:00
pigeons
d14df868cd Fixes overlay update for washing bloody hands (#37094) 2018-04-11 07:30:45 -05:00
iksyp
5a06fd98ed Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful (#36670)
fix: makes dragnet non harmful
tweak: pacifists can now use any disabler or stun setting on any energy gun
code: removed all of the pacifism check code from code/modules/mob/living/living.dm
code: gun objects no longer have a harmful variable, instead, ammo_casing objects now have a harmful variable, which is by default set to TRUE
code: if a pacifist fires a gun, it checks whether or not the round chambered is lethal, instead of whether or not the gun itself is lethal.
2018-04-11 04:59:57 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
deathride58
d3ba1085bb you've gotta be kidding 2018-04-08 18:54:16 -04:00
AnturK
73efe7245c Fixes slime latching (#37002) 2018-04-08 04:59:02 -05:00
deathride58
87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
deathride58
1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560
[MIRROR] [READY]AI latejoins
2018-04-08 02:25:10 +00:00
AnturK
3de992aee2 Fixes cow tipping properly (#37015) 2018-04-07 18:15:00 -05:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
Jordan Brown
66dabf4ff7 Merge pull request #36976 from Iamgoofball/patch-422
fixes cows moving while tipped
2018-04-06 00:43:38 -05:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
2018-04-05 00:17:27 +00:00
kevinz000
3d26bf4355 Worse than ERP 2018-04-04 14:27:50 -07:00