Commit Graph

18966 Commits

Author SHA1 Message Date
oranges
32a2f2bf5e Merge pull request #22833 from ChangelingRain/descfix
Fixes a login message
2017-01-10 09:57:59 +13:00
oranges
f79476634c Merge pull request #22829 from ChangelingRain/blockedturffix
Fixes a few things considering turfs 'blocked' by a mob
2017-01-10 09:57:43 +13:00
oranges
cea71b3348 Merge pull request #22808 from Cyberboss/patch-6
Refactors events to use callbacks
2017-01-10 09:53:52 +13:00
XDTM
6a562f7b5a Makes earmuffs and null rods protect from Voice of God, adds earmuffs to autolathe (#22764)
* Makes mindshield implants protect from VoG

* earmuffs

* New deal

* Rudimentary logging

* Retvar/Narsie fix
2017-01-10 09:53:09 +13:00
oranges
21331f6c14 Merge pull request #22741 from KorPhaeron/anchoredflagholder
CTF bug fixes
2017-01-10 09:52:17 +13:00
Cyberboss
97a57d9805 Fixes roundstart MMI runtimes (#22771)
* Fixes roundstart MMI runtimes

* Fix the problem temporarily
2017-01-09 21:36:34 +01:00
Kyle Spier-Swenson
9a95a887d7 Fixes preferences links for ghost radio/pda (#22854) 2017-01-09 11:04:04 -05:00
Cheridan
12d4ab68c7 Merge pull request #22843 from bgobandit/slimesurgery
Slime core surgery works again.
2017-01-09 00:21:09 -06:00
Remie Richards
3f1faf85cb Fixes augmentation surgery allowing non-robot limbs (#22815)
* Fixes augmentation surgery allowing non-robot limbs

```&&``` -> ```||```

* user feedback is nice
2017-01-08 20:32:07 -05:00
PKPenguin321
bf65b28334 critical grammar fix (#22830)
)
2017-01-08 20:31:17 -05:00
oranges
25f446da76 Merge pull request #22853 from MrStonedOne/patch-283
[s]Throttles preferences hrefs
2017-01-09 08:59:16 +13:00
Cheridan
4a03a77244 Merge pull request #22803 from ChangelingRain/tempoverlays
Changes a few things into temporary visual effects
2017-01-08 12:51:07 -06:00
Cheridan
7003e73e97 Merge pull request #22807 from bgobandit/ilovetypos
Fixes photon torpedo description, fixes more grammar shit.
2017-01-08 12:40:01 -06:00
Cheridan
bbeecc35ac Merge pull request #22822 from swindly/radfix
Fixes rad immune species accumulating infinite radiation
2017-01-08 12:27:55 -06:00
Kyle Spier-Swenson
db27bb7727 Throttles preferences hrefs
The user will not be allowed to trigger a click on a preferences href until their previous one has finished.

rshoe is using it spam us.

I know somebody was talking about trying to do a more proper fix, such as by making it not re-generate these when it's the same, so i'll test merge this until 24 hours or they make such a pr.
2017-01-08 06:58:56 -08:00
bgobandit
119747bb78 misleading medibeam message 2017-01-08 03:13:53 -05:00
bgobandit
2467c68d42 Slime core surgery works again. 2017-01-08 00:42:14 -05:00
Joan Lung
fe34bfcca4 Fixes a login message 2017-01-07 18:37:40 -05:00
Joan Lung
1f85d27652 Fixes a few things considering turfs 'blocked' by a mob 2017-01-07 17:58:51 -05:00
oranges
37b1fa6eea Merge pull request #22793 from Core0verload/world_time
Fixes latejoin panel and world topic showing incorrect round duration
2017-01-07 19:43:39 +13:00
oranges
d2749cc55f Merge pull request #22788 from MrStonedOne/patch-281
Fixes stealthmin reveal in who
2017-01-07 19:42:31 +13:00
bgobandit
4520e393f7 Fixes the admin message for morph, devil and slaughter demon spawns. (#22770)
* Morphling logs ckey correctly

* refactors every other spawn event apparently

* fixes a typo while I'm in the file
2017-01-07 19:41:39 +13:00
Tacolizard
ac819a17f2 Removes animation on lighting changes, increases light max radii (#22754)
* change light update speed

* lower dynamic light max radius vals

* wew i actually improved the code for once

* remove define

* mso's wish is my command

* yeh biatch

* found one
2017-01-07 19:40:27 +13:00
oranges
89ad3be0d0 Merge pull request #22748 from ChangelingRain/meteorshieldfix
The Meteor Shield station project now actually shields from meteors
2017-01-07 19:40:08 +13:00
oranges
1753f793c9 Merge pull request #22744 from KorPhaeron/aliens2
Fixes alien inventory not updating when toggling spit
2017-01-07 19:39:23 +13:00
oranges
bd796347ad Merge pull request #22743 from XDTM/ReeeND
Fixes destructive analyzer not being able to scan chem containers
2017-01-07 19:39:14 +13:00
oranges
eb0aad18fa Merge pull request #22742 from KorPhaeron/alarm
Fixes cyborgs making strange sounds when empd
2017-01-07 19:38:58 +13:00
TehZombehz
8cc9e6de50 Adds regenerate_organs proc and adds it to relevant regeneration code (#22740)
* Adds regenerate_organs proc to carbon and adds it to relevant regeneration code

I simply took the bit from the admin heal and made it into a proc and
added it to the necessary regeneration-related bits of code.

* Adds regenerate organs back to fully heal

For some reason this didn't get included in the previous commit.

* moves regenerate_organs to organ_internal

As suggested. It fits better here, anyways.
2017-01-07 19:38:29 +13:00
oranges
a0c6052e53 Merge pull request #22726 from coiax/press-start
The Start Now verb sets the round to start immediately
2017-01-07 19:38:15 +13:00
bgobandit
0d4249a5ba addictive typo fixing 2017-01-07 00:55:09 -05:00
bgobandit
d27712b9e5 moar typos 2017-01-07 00:43:02 -05:00
bgobandit
bbbc9b99f7 more typos and stuff 2017-01-06 20:38:54 -05:00
Cyberboss
4fc79dbb95 Refactor events to use callbacks 2017-01-06 20:35:00 -05:00
bgobandit
08a8277873 more grammar fixes 2017-01-06 20:23:15 -05:00
Joan Lung
be6a7642a6 hmm 2017-01-06 17:01:18 -05:00
Joan Lung
5b59050d15 ) 2017-01-06 16:57:17 -05:00
bgobandit
945d4f060f The Floor Is Lava and Advanced Darkness work again. (#22780)
* The Floor Is Lava and Advanced Darkness work again.

* define memes
2017-01-06 16:55:45 -05:00
Joan Lung
b0f3a27261 Changes a few things into temporary visual effects 2017-01-06 16:45:36 -05:00
swindly
ca49c56a97 radimmune fix 2017-01-06 15:15:19 -05:00
Cheridan
37ddf5b998 Merge pull request #22749 from ChangelingRain/adminhelpfix
Fixes something not properly re-checking after a delay
2017-01-06 13:46:46 -06:00
Trugath
4105ca9ea6 Tgmonkey (#22338)
* Monkeys are a bit more of a handful
They will aggro, steal, pick up weapons and stuff bodies in disposals

* search using held_items instead of manually

* Only natural monkies should reliably stun
Natural monkies don't try to stun-lock

* Pushes equip_in_one_of_slots to carbon from human

* Removed unused helper.

* Make the trip and stun only against monkeys
The main reason this is here is for the swarm behaivour.

* Just return true for now. It should flee on next life tick.

* remove blocking call from Life

* stuff_mob_in blocks so make it non-blocking

* add check to stop add/remove in same function
Only occours if the monkey attacks someone who isn't in the enemies list.
This only happens during a monkey swarm. Best to check.

* Fix for monkeys ripping stuff off walls.

* Moved shared emote/weaken down into living
Called the new function knockOVer. Monkey and Secbot both have different
control flow before the shared code.

* Stop monkeys fighting over body

* Remove commented out code

* Reduce flee range

* replace spawn with addTimer by moving code into callbacks

* Move magic numbers to defines
Also removed 900 delay in resisting cuffs as its a useless argument

* Refactor. Attacking has a function: monkey_attack
Combined de-aggro into it

* rework monkeyDrop to force drop
Also check for deleted items when snatching items

* Aggresive can be toggled by an admin
Allows for a mass mob of angry monkies

* Tweak aggressive monkeys to attack each other less
Monkey vs Monkey probability is a define
Warning: Once MVM combat breaks out in large mobs, mayhem insues

* Set the monkey back to idle once it attemps to dispose the body

* fix for aggressive monkeys self-harming

* comment wording fix

* changed walk2derpless to a callback and fixed deathgrip
2017-01-06 14:59:37 +01:00
c0
06d8ffb439 Fixes latejoin panel and world topic showing incorrect round duration 2017-01-06 07:15:07 +03:00
Kyle Spier-Swenson
b7f25a7375 Fixes stealthmin reveal in who
One of these days we will refactor all of this shit to not be a big mess of if else chains so you don't have to remember to edit 5 lines to change the formatting.
2017-01-05 18:24:07 -08:00
oranges
3a77966186 Merge pull request #22728 from XDTM/MechHole
Fixes wormholes not being usable by mechs
2017-01-06 09:58:29 +13:00
oranges
b32061ea37 Merge pull request #22727 from XDTM/PocketShoes
Fixes storage pockets preventing the use of items on the clothing item
2017-01-06 09:57:45 +13:00
oranges
373b61c741 Merge pull request #22704 from TehZombehz/deliveryDeconstruct
Fixes delivery chutes not being deconstructable
2017-01-06 09:54:12 +13:00
TehZombehz
d0d24621ad Various Tator Tot Fixes (#22702)
* Various Tator Tot Fixes

Fixed missing sprite, some minor punctuation, and potato wedges not
properly processing into fries.

* More grammatical fixes

Removes an extra 'the' and capitalizes one sentence.
2017-01-06 09:53:45 +13:00
Cheridan
73814c2274 Merge pull request #22717 from optimumtact/accordingtoallknownlawsofaviationthereisnowayabeeshouldbeabletofly
Fixes fly person species name
2017-01-05 00:18:00 -06:00
oranges
de92eb81d7 Merge pull request #22716 from Core0verload/easy_replace
Makes replacing lights easier
2017-01-05 19:12:17 +13:00
oranges
f308c197e7 Merge pull request #22714 from Core0verload/escape_pod_fixes
Escape pod fixes
2017-01-05 19:12:03 +13:00