99d545d185
Merge pull request #8891 from Incoming5643/logic_who_needs_that
...
Fixes a few unreported logic goofs in my newest mulligan pull
2015-04-13 18:24:02 +10:00
e2c869bc77
- Adds generic action and action buttons system
2015-04-11 17:06:43 +02:00
1ce1b5b67d
Fixes a few unreported logic goofs in my newest mulligan pull
2015-04-11 03:41:17 -04:00
d1892cffbe
Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
...
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.
The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:
End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)
When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
d78ca0c57a
Merge pull request #8566 from Incoming5643/literal_fun_removal
...
Magic Mania NaN: The Fun Ends Here
2015-03-30 01:25:52 +11:00
50ec2f3224
Makes the ability for wizards to use summon guns, summon magic, and summon events a config option
2015-03-27 01:32:28 -04:00
c7a93d2e6e
Adds Lightning Bolt spell
2015-03-24 22:15:22 +01:00
c474035261
*Retires Departmental Uprising to the land of admin only access like its brother fake explosion before it *Changes the mechanics of recasting summon events to only reduce the upper limit of the time between event casts (-1 minute each additional cast) as opposed to touching the lower limit as well, which led to events every 15/30 seconds which, while certainly a scene, I admit was a bit much. Casting summon events 5, 6, or 7 times will now at worst result in an event every minute.
...
*If a wizard round mulligans, summon events will turn off if it was used. Remember that in wizard mulligans any apprentices will need to be dead too.
2015-03-20 21:04:33 -04:00
29609457f5
Makes the message when you're attacked slightly bigger for better visibility."
...
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
e846a6eeb4
Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack!
...
Conflicts:
code/game/gamemodes/wizard/spellbook.dm
icons/mob/mask.dmi
2015-03-09 01:47:40 -05:00
e20f36d639
* Fixes runtimes with Summon Guns.
...
* Fixes some summoned guns uncorrectly instanciating pins
2015-03-07 04:03:40 +01:00
92a40fc470
Merge pull request #8126 from Iamgoofball/raginmages
...
fixes Ragin' Mages making only 1 mage
2015-03-06 13:04:48 -06:00
d36488e5a2
Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
icons/obj/wizard.dmi
2015-03-03 20:58:38 +00:00
a07f6e6bfa
Merge pull request #8103 from Ikarrus/antag_babbies
...
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
3422390c94
fixes Ragin' Mages making only 1 mage
2015-03-02 21:08:51 -08:00
f95ca85ed6
Age Restrictions for Antagonists
...
Default minimum age is 7 days.
Team Antag modes and wizard is 14 days.
Malf minimum is 30 days (Same as AI minimum age).
2015-03-01 20:40:04 -07:00
79edc1ff88
Replaces the custom "how many people are dead?" check with the one used for survival rates on round end statitistics because, lets be honest here, we know that one works.
...
Shuffles some flags around that should hopefully prevent round_converted() from running more than once. It's not a huge crisis if it does because late join antag is self capping, but still, not intended behavoir!
2015-03-01 12:13:55 -05:00
679c63a8ea
Merge pull request #7924 from Incoming5643/mulligan_rounds
...
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +00:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
24cc205ce5
On primary antagonist rounds (wizard/blob/malfunction) if the config is set for continous rounds the round will convert on the fly to a new mode choosen from these mode if the primary antagonist dies:
...
EXTENDED
TRAITOR
CHANGELING
DOUBLE AGENTS
TRAITORLING
based on the game probabilities set through the config.
The round will not convert if more than 30% of the players are dead (round immediatly ends) or if the shuttle is beyond the point of no return (the round ends normally).
Adds the CONTINIOUS_ROUND_BLOB config
2015-02-22 21:32:17 -05:00
e5b53f2e3c
Finishing up
2015-02-21 01:26:58 +00:00
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
15e2b88a0f
removes bloat from magazines icons
2015-02-17 19:43:20 -08:00
52477eb16e
Adds a new spell. The Barnyard curse
...
Created a new file because I didn't want to get rid of the horseman
curse. Essentially the same as the horseman curse but you can also be a
pig and a cow.
2015-02-17 00:44:45 +00:00
15439b8c4e
Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
...
Conflicts:
code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
7804cda382
Merge pull request #7443 from Jordie0608/riftbarnforallyourriftingneeds
...
Modular veil renders
2015-02-14 17:45:25 -06:00
135293bedf
Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
...
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
0755d4041b
Swaps spear for Sword, Adds changelog
2015-02-13 07:15:59 +00:00
6ae368e3d6
unique sprite for honk render
2015-02-12 23:10:31 +11:00
3da8f70e4d
fixes #7608
2015-02-07 20:48:50 -06:00
ac60a828f9
Merge pull request #7536 from Iamgoofball/chemblob
...
fixes my shit
2015-02-05 18:04:54 +01:00
ce7c2e13ff
Changes Spellbook can't open text
2015-02-04 18:55:34 -08:00
9a1036d43b
Fixes #6991
2015-02-03 20:26:58 -08:00
453a3db196
etc
2015-01-30 23:18:02 -08:00
787c74d9d4
rift desc and activate message as vars
2015-01-31 15:20:22 +11:00
49b573e154
Adds a counter of how many thralls are linked to a stone in it's description, Adds Necromantic stones to summon magic
2015-01-31 01:43:07 +00:00
304bc82ff0
Adds a necromantic stone capable of bringing 3 people back as skeletons bound to the user's will. Wizards can buy these.
2015-01-30 17:41:46 +00:00
c2b3e885a6
Modular veil renders
2015-01-30 17:17:38 +11:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
bf938b5383
Removes an unused var that was causing a warning.
2015-01-24 13:56:55 +01:00
096d0ed46e
Merge pull request #7243 from tkdrg/rage
...
(Tries to) fix ragin' mages underflow
2015-01-24 12:51:18 +01:00
3ede794bb6
(Tries to) fix ragin' mages underflow
...
The amount of mages made was going negative for some reason. This
attempts to fix that. Also general ragin' mages cleanup.
2015-01-21 03:00:10 -03:00
071e2aee3c
fixes conflicts
...
swaps appretice and wizard icons
2015-01-16 13:45:36 -05:00
4a0aa0c0a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/ammunition/ammo_casings.dm
code/modules/projectiles/ammunition/boxes.dm
icons/obj/ammo.dmi
icons/obj/gun.dmi
2015-01-15 22:16:11 -08:00
6bfebf2e48
Adds bolt-action rifle
...
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151
These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.
The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
2015-01-16 03:03:34 -03:00
eae84c1c39
further conflicts and bugfixes
2015-01-15 21:59:36 -08:00
ab7d50c90e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/guns/projectile/launchers.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/research/designs/weapon_designs.dm
icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
51a42968f0
Merge pull request #6886 from hornygranny/soulshardboogaloo
...
only wizards and cultists can use soul shards
2015-01-15 23:11:11 -06:00
5f46ebe2b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-15 16:14:27 -06:00
7fe46696d2
Merge pull request #6963 from Boggart/wizrepulse
...
Adds a new spell, Repulse.
2015-01-14 14:36:00 -03:00
Jordie
AnturK
Incoming
phil235
Cheridan
Menshin
Cheridan
Remie Richards
Razharas
Iamgoofball
Ikarrus
Sometinyprick
paprka
Swag McYolosteinen
tkdrg