Commit Graph

3214 Commits

Author SHA1 Message Date
Jordan Brown d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Joan Lung ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
kevinz000 44e99ed7ba Adds Headphones! (#28993)
* kek

* this /should/ work.

* icon updates and wardrobes and vendors

* remie

* Update ears.dm

* typecast

* states

* updates

* Update fitness.dm

* Update wardrobe.dm

* Update vending.dm
2017-07-07 13:44:21 -04:00
Jordan Brown f4203ba88d Merge pull request #29088 from Really-Good-Soda-Flavor/marTIALARTS
Makes martial arts not be deleted
2017-07-07 10:38:44 -04:00
Shadowlight213 68102aaa0c Refactors speech/communication logging and adds coordinates to speech logs (#28997)
* Adds locations to speech and related communications
Refactors how logging is handled for these.

* changes

* ahhhhh

* preemptive merge conflict undoing maybe?

* Let's not delay this further
2017-07-06 16:06:43 -04:00
Joan Lung bea7bf9297 Adds Necropolis curses for cursed items in Necropolis ruins (#28992)
* Adds Necropolis curses for cursed items in Necropolis ruins

* Adds sounds credit @FuryMcFlurry

* stat tweak

* these are painful enough

* a bit stronger

* i kind of wish there was a version of get_ranged_target_turf() that worked off of angle.... but there isn't

* smart coder 2000

* bossed around
2017-07-06 11:14:26 -04:00
food 58c0be66a3 Makes martial arts not be deleted 2017-07-06 11:04:51 -04:00
Supermichael777 79c01530fb Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut. (#28877)
* Hopefully I didnt fuckup massivly

* I hope this works

* adds a disconect mesage

* adds disconnect message

* im a newb

* by request
2017-07-06 10:52:50 -04:00
Jordan Brown 5f6090f7b3 Merge pull request #29015 from Xhuis/deconvert_messages
Unconscious Servants are now properly informed when they're deconverted
2017-07-04 18:13:45 -04:00
Joan Lung 70dcd2ea9b Clockcult conversion has more explicit logging in what did it (#29007)
* Clockcult conversion has more explicit logging in what did it

* clang

* tweak
2017-07-04 15:40:45 -04:00
Really-Good-Soda-Flavor d23c6f910d Checks for temporary martial arts on mind transfer (#28746)
* Checks for temporary martial arts on mind transfer

* Makes transferring its own proc

* Makes sure martial arts are qdeleted on removal

* Improves teaching and removing
2017-07-04 11:34:05 +02:00
Xhuis 0aa489f2b4 Uses ignored_mob 2017-07-03 20:53:17 -04:00
Xhuis ff24b40b0c Decon messages are now visible to unconscious cultists 2017-07-03 18:30:07 -04:00
Ashe Higgs 4a80a8fbe6 Rewrites Recollection and splits it into categories, rewords Hierophant Network description (#28711)
* Rewrites Recollection

* Conflicts 1

* Typos and stuff!

* Capitalizes more stuff

* capitalizations, rewords, oh my

* Conflicts 1

* Conflicts 3 (and space!)

* More changes
2017-07-03 11:09:47 -04:00
Jordan Brown 9a5a2a35aa Merge pull request #28966 from ChangelingRain/minerruins
Actually adds the blood-drunk miner ruins
2017-07-02 22:57:57 -04:00
Joan Lung 407e0e77e4 Ruin placement will try very hard to place any ruins with negative costs before attempting any other ruins (#28973)
* Ruin placement will try very hard to place all 0-cost ruins before placing any ruins with actual costs

* comment

* account for ruin variants properly please

* cost has a cost of 5

* tweak
2017-07-02 22:57:32 -04:00
Joan Lung be746c1946 Actually adds the blood-drunk miner ruins 2017-06-30 23:20:16 -04:00
Joan Lung a110e881ad Adds the blood-drunk miner as a potential mining "mini" boss (#28829) 2017-06-30 22:39:49 -03:00
Jordan Brown 722fee5a18 Merge pull request #28899 from ChangelingRain/stunfixfixfixfix
Fixes the Unconscious status effect not updating stat
2017-06-29 09:35:09 -04:00
Jordan Brown 048c531952 Merge pull request #28893 from optimumtact/rankup
Remove the R_REJUVINATE flag and replace with R_POLL
2017-06-29 00:53:15 -04:00
Leo ac96764660 Merge pull request #28851 from Cyberboss/RevertBorers
Removes cortical borers
2017-06-28 10:33:51 -03:00
oranges 8ef47216a5 Remove the R_REJUVINATE flag and replace with R_POLL
Rejuvenation lives under R_ADMIN and R_POLL is a new flag you can grant
to someone to allow them to create polls
2017-06-28 02:38:00 +00:00
Joan Lung 9891d1fc1f Fixes the Unconscious status effect not updating stat 2017-06-27 19:26:02 -04:00
Leo f8cad7c0f7 Merge pull request #28855 from lordpidey/lordpidey_devil_fixes
Minor devil fixes.
2017-06-27 18:23:29 -03:00
Matthew Walker f3afd18551 Move eye_damage from /mob/ to eye organs (#28725)
* First test change, only damage

* take out unused var

* null check

* First test change, only damage

* take out unused var

* null check

* Fixes some wizard stuns (#28693)

* First test change, only damage

* take out unused var

* null check

* review changes

* Hate git
2017-06-27 16:51:29 -04:00
Leo 3757ef5943 Merge pull request #28850 from GunHog/Malf_Shell_Fix
Fixes AI <-> Shell mind transfer issues
2017-06-27 12:29:36 -03:00
Mike Long 4185f8959f Fixes bugs in devil
Fixes devils not losing souls upon resurrection,.
Fixes spells appearing deactivated upon resurrection.
Fixes unascendable devils being able to get ascension grade spells.
2017-06-26 12:30:59 -04:00
Jordan Brown ef96559701 Removes cortical borers 2017-06-26 11:21:08 -04:00
GunHog 14e3b9a7c2 Fixes AI <-> Shell mind transfer issues
- Fixed Traitor/Malf AIs resetting their antagonist status and points
upon transfering to a shell and back.

- Fixes connected borgs being shown their laws when the AI returns to
its shell.
2017-06-26 09:37:25 -05:00
KorPhaeron 060b767a47 Ninja Dash (#28644) 2017-06-26 10:57:12 -03:00
AnturK 0c3edf1ff7 Shuttle engines affecting travel time (#28564) 2017-06-25 22:52:06 -03:00
Joan Lung 601ad4beda Adds the Cleaving Saw as what will be the reward for killing a miniboss (#28565)
* Adds the Cleaving Saw as what will be a reward for killing a miniboss

* slashslice

* wowduh

* some tweaks

* bleed!

* a little slower

* Smaller cleave, higher damage

* more info

* saw icon

* It's finally dooooone!

* done
2017-06-25 12:49:32 -04:00
Joan Lung 70e712017e Status effects start processing immediately instead of on the next timer subsystem tick (#28747)
* Status effects start processing immediately instead of on the next timer subsystem tick

* let's fix this while we're at it

* hup

* not technically efficient but better than not updating when needed
2017-06-25 12:47:10 -04:00
Jordan Brown 94effbd25f Replaces all instances of the tgstation2 map with Box Station (#28463)
* Replaces all instances of the tgstation2 map with BoxStation

* Fix basemap
2017-06-25 18:15:56 +02:00
Steelpoint f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
Jordan Brown 37e00d62bd Merge pull request #28716 from lzimann/offhand
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once
2017-06-23 15:07:37 -04:00
Joan Lung deae811756 Unconscious and Knockdown are now status effects (#28696)
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
2017-06-23 12:00:49 -04:00
Lzimann 88816aae12 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being
qdelled many times.
2017-06-22 16:32:24 -03:00
nicbn 77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Joan Lung 58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10:00
Ashe Higgs cbdcd08691 Malf AI module refactor and small additions (#28334)
* Refactors malf AI modules to modern standards

* Updates the goonchat stylesheet

* Moves air and fire alarm overrides

* squash commits!

* Fixes some things

* Review, fixes

* does the thing!

* Requested changes
2017-06-21 15:35:03 -04:00
Mike Long 39103452a3 Lordpidey devil fixes (#28101)
* Fixes on #28051

* Changes hellfire around some, it's now more consistant.

* Fixes small exploit with infernal jaunt.

* Moves devil antag datum with the rest of the antag datums.

* Corrects syntax errors within codex gigas tgui template.

* Re updates tgui js after merge.

* removes redundant .loc from call.

* Fixes devils sometimes getting duplicate spells.
2017-06-21 10:47:02 +02:00
Leo fb366a6d22 Merge pull request #28613 from ohnopigeons/youregonnacarrythatweight
Fixes pimpin ride janicart (and other ridden vehicles) being spaceworthy
2017-06-20 20:00:49 -03:00
Jordan Brown 50f00bc023 Merge pull request #28603 from ChangelingRain/sleeptostatus
Sleeping is now a status effect
2017-06-20 16:22:34 -04:00
Jordan Brown 59a3865f60 Merge pull request #28600 from ChangelingRain/hiddenripley
Adds a heavily-damaged ripley as a lavaland ruin
2017-06-20 13:08:48 -04:00
kevinz000 d1108df80c [READY] The Portal Update - Linked portals, momentum conservation, and more! (#28055)
* THE PORTAL UPDATE

* portal gun checks

* damn functions

* o_range(s)

* Atmos Portals (#12)

* Rod Form's damage now scales with how much it's upgraded

* buffs chem grenades

* Fix getrev runtime

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

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

* Fixes admiral recall (#27861)

* the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#27978)

* Beam rifles now slowdown while scoped (#27898)

* Update beam_rifle.dm

* Update beam_rifle.dm

* Update beam_rifle.dm

* Fixes a very silly clockwork false wall trick (#27996)

* Fixes #27979 (#28002)

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

* Fixes #27989 : Riot suits no longer hide jumpsuits (#28003)

* Fixes #27989

* remove tag

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

* Refactors a cooldown var to not require a spawn or sleep (#28011)

* wat (#28012)

* Remove spawns in favour of stacktrace calls, which don't stop the called (#28013)

proc

* Refactor another spawned cooldown var (#28014)

* Come on, pathetic (#28015)

* Refactor another spawn cooldown (#28016)

* Goodbye spawn (#28017)

* Another spawn timer (#28018)

* Remove a commented out function (#28019)

* Gotta go with the fro2.0 (#28010)

* This doesn't do anything (#28020)

* refactor another spawn cooldown (#28022)

* Refactors another spawn cooldown var (#28023)

* Refactor another spawn (#28024)

* Refactor another spawn var (#28027)

* woops

* woops2

* atmos links!

* unused

* wew

* ffs!

* Forced updates

* update

* Update portals.dm

* adjacent/atmospass checks

* Create portals.dm

* Update portals.dm

* Update other_tools.dm

* stuff

* crossed

* documentation

* reee

* no portal stacking!

* woops
2017-06-20 11:02:01 -04:00
Jordan Brown 1c8badd8fe Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
oranges 186d17b77b Refactors hitreaction to pass in the hitting atom
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00:00
Pigeons ccbe27f977 Removes pull check in Process-Spacemove in riding datum 2017-06-19 16:54:25 -04:00