Commit Graph

2928 Commits

Author SHA1 Message Date
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Cheridan 78093c0bf0 Merge pull request #13556 from bgobandit/matsagainfuckina
Adds mats/origin tech/burn_state to more items.
2015-12-11 17:13:42 -06:00
Razharas 7929c027fa Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up
Apprentice clean up / bugfixes
2015-12-11 22:50:46 +03:00
Remie Richards 53172fa9ce Merge pull request #13516 from Anonus/whymode
Fixes up blob code some
2015-12-11 18:14:56 +00:00
bgobandit 984582f6ba tweaks and shit 2015-12-10 15:48:22 -05:00
Incoming 6a64864805 formally defines apprentices as a kind of antag instead of as "traitors".
Wizard events that spare the wizard should now properly spare apprentices too.

Moves renaming as an apprentice to the end of the spawn proc because the input prompt stops various important things (including the sound meant to inform people they got apprentice) from happening until after it's dealt with.

Restores the "+" for positive quality items in RPG loot. The reason this was changed was already fixed, it just was mistakenly never put back.
2015-12-10 12:08:49 -05:00
Cheridan 3c98d1f8cf Merge pull request #13505 from Incoming5643/hud_buds
Fixes a few team hud issues
2015-12-09 10:20:26 -06:00
Nerd Lord 41fde5757f Fixes up blob code some;
any blob can block atmos, the core and nodes now do so
blobs use two different procs for checking health and updating icons instead of one(there's probably a use for this)
the split consciousness verb now requires a node under your selector, instead of checking a global list of nodes and picking the newest(why?)
blobs can no longer take non-brute and burn damage types(I would make toxin do bonus damage but the crew can't apply it anyway)
2015-12-08 23:58:05 -05:00
duncathan salt 90f6e491c1 Merge pull request #13501 from Anonus/darkblob
Makes blobs emit less light
2015-12-08 21:27:14 -06:00
duncathan salt 43358ba5d4 Merge pull request #13489 from ktccd/BlobwinFix
Fixes the blob win condition
2015-12-08 11:52:10 -06:00
Remie Richards 2aa6096fe4 Merge pull request #13447 from KorPhaeron/fountain
Healing fountain subtype for use by anyone
2015-12-08 07:56:33 +00:00
Incoming c9cb9a1520 whooooooops 2015-12-08 02:42:39 -05:00
Incoming 675bfdc781 Shuffle up and deal 2015-12-08 01:29:10 -05:00
Incoming ebec6f5775 Fixes midround head revs not getting their hud updated to show their new status.
Fixes wizard modes with hud icons not using hud icons
2015-12-08 01:22:22 -05:00
duncathan salt 0472592b97 Merge pull request #13327 from KorPhaeron/reactive
check_shields() refactor
2015-12-07 19:58:17 -06:00
KorPhaeron 0c31ca58cc Fixes changeling shields 2015-12-07 19:05:57 -06:00
Nerd Lord 142d5a9aba mso please give better examples 2015-12-07 18:47:18 -05:00
Nerd Lord fd0b33cab6 you see a flicker of green flesh past the burning flames... it seems the blob is still alive
>flee
>aggress
>nuke
2015-12-07 18:34:47 -05:00
Nerd Lord 9aea70de57 A number of fixes to blobs, in addition to making blobs emit less light. 2015-12-07 18:26:50 -05:00
ktccd c4c6fde30d Fixes the blob win condition
This is a bug that seems to have been around since... a long time ago.
It also explains why blobs keep winning easily, seeing as their win
condition used to be SET to 2*350 instead of increasing by the the
amount used per blob.
This should hopefully make blob mode work as intended.
2015-12-07 00:03:48 +01:00
Nerd Lord a0b2b0a721 Couple of small fixes.
thou shalt not flee the will of nar-sie
2015-12-05 19:09:21 -05:00
Nerd Lord 58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
KorPhaeron 4253585e1e Use TRUE/FALSE instead of 1/0 2015-12-04 13:28:19 -06:00
KorPhaeron 9d591c1c5f Healing fountains 2015-12-04 13:26:03 -06:00
Cheridan 3cf6dc50be Merge pull request #13414 from AnturK/shadowlingfix
Fixes shadowling hatch
2015-12-03 15:35:46 -06:00
AnturK 7a34287a7d Fixes shadowling hatch 2015-12-03 12:00:55 +01:00
Jordie bfe4d41554 Merge pull request #13408 from neersighted/hotfix
Hotfix for SStimer lag
2015-12-03 14:34:45 +11:00
Bjorn Neergaard 6ec257c360 Hotfix for SStimer lag
SStimer can now check dupes
Also fix ghosts not being inquisitive with objects...
2015-12-02 21:23:45 -05:00
Bjorn Neergaard 8cc3a856a2 Add map_name to areas
Fixes #12713
2015-12-01 10:03:03 -06:00
KorPhaeron fab3cdc3a2 Cleans up copypaste, adds missing block chances 2015-11-30 16:39:02 -06:00
KorPhaeron 2609adb29d Blocking overhaul 2015-11-30 16:22:31 -06:00
Remie Richards edfb957bd2 Merge pull request #13088 from as334/master
Plasmamen fixes
2015-11-29 19:17:11 +00:00
as334 dc98e67f05 Just fuck my shit up fam 2015-11-29 13:48:58 -05:00
duncathan salt 9e9ccf9474 Merge pull request #13268 from Anonus/teachingsofnarsie
Cult theme update
2015-11-29 12:23:07 -06:00
Nerd Lord fba1c1129a fine, fine fuck okay sure
don't sacrifice dogs, okay? nar-sie has standards, of a sort
2015-11-29 13:11:18 -05:00
Jordie fd96c313a7 Merge pull request #13248 from bgobandit/dominatorfix
Fixes dominator error message issue.
2015-11-29 21:08:38 +11:00
Jordie aa672d3e95 Merge pull request #13230 from JJRcop/i12317
Fixes changeling hivemind download
2015-11-29 21:07:18 +11:00
Jordie 56c2659736 Merge pull request #13187 from ktccd/master
Fixes areas blobs shouldn't win from spreading to.
2015-11-29 21:06:46 +11:00
Jordie 38eddb1421 Merge pull request #13179 from AnturK/academy
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
Jordie da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
as334 611fb49c1c Wake me up inside 2015-11-29 00:58:30 -05:00
Nerd Lord b926afc3ef Fixes rune code a little, the revival beam goes the right way now. 2015-11-28 21:24:17 -05:00
AnturK b14e9133d2 Academy Update 2015-11-28 12:35:41 +01:00
AnturK 9fd9e5c21d Makes user explicit in spell code 2015-11-28 12:35:40 +01:00
Nerd Lord cdd93677f9 Corgis no longer do anything special when being sacrificed. Fuck that.
Removes sac_act for being entirely unused.
2015-11-27 23:05:54 -05:00
Nerd Lord f9a92c1215 Fixes.
You can sacrifice corgis with no punishment if you've gotten the sacrifice target or there is no sacrifice objective.
2015-11-27 22:33:38 -05:00
Nerd Lord 1414070115 Cult theme update;
Cult stuff uses cult span classes for the most part.
There are beams when using blood drain on a target and when reviving a target with the raise dead rune.
There's a nar-sie maw when you sac something, holy shit.
Sac invocation is now the old invocation, and it worked in testing I promise.
Updates construct descriptions to match what they tend to do.
There's like one or two bugfixes, you can examine talismans as a cultist without the paper menu popping up.
The supply talisman popup is like 50% smaller.
2015-11-27 21:53:56 -05:00
ktccd 6fe6db75be Brings code up to current specs
Also removes some of my unneded comments.
2015-11-28 01:57:28 +01:00
ktccd b269e5bab8 Update to bring code in line with standards
Removes some unecessary text as well.
2015-11-28 01:27:29 +01:00
ktccd 395cd5a68c Rewrote a bit of blob code to fix... a lot
Stuff fixed: My sad attempt at fixing #13126.
The expand() proc for blobs is hopefully less intensive now (WHY did it
used to spawn a blob only to destroy it? That must've been such a
waste...).
Destroy code no longer needs to adjust for the expand() proc doing weird
things.
The antag panel will now show the correct variable used to determine
blob progress.
Renamed the variables I used so they're not so similar to each other.
blob_legit and blobs_legit was WAY to easy to mix up.
2015-11-28 01:06:27 +01:00