Commit Graph

168 Commits

Author SHA1 Message Date
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tigercat2000 519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00
Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
2016-03-31 13:33:46 -04:00
Aurorablade a34efa3af8 fixes demons 2016-03-29 20:51:16 -04:00
Tastyfish 25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
Aurorablade 848a590930 daemon 2016-03-11 01:48:09 -05:00
Aurorablade 70c510280a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DemonicUpdate 2016-03-10 20:19:08 -05:00
Aurorablade 7218478c9e tigerrawr 2016-03-10 19:46:17 -05:00
Aurorablade 6918e79943 Rawr 2016-03-07 19:53:14 -05:00
Tastyfish 422a2e6ed4 Fixes lich spell preventing round end when viewed in the spellbook 2016-03-06 21:59:48 -05:00
Fox McCloud ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Fox-McCloud e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -05:00
Tigercat2000 0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -08:00
Aurorablade 400ed30455 issue with identity transfer 2016-02-13 15:20:21 -05:00
Aurorablade 9a55bb11b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-13 06:37:49 -05:00
Aurorablade 545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Fox-McCloud 5f2b5f1fde Updates Fake Disintegrate and Spell Icons 2016-02-10 00:01:37 -05:00
Fox-McCloud a64e95104e Removes Mindswap Suiciding 2016-02-05 22:30:43 -05:00
Aurorablade 25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Tastyfish ef79569075 Fixed continuous rounds 2016-01-30 20:33:45 -05:00
Fox-McCloud 887ce1f37e fixes blind spell 2016-01-29 21:31:16 -05:00
Fox-McCloud 1404d66fff tweaks 2016-01-29 19:40:46 -05:00
Fox-McCloud 1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Fox-McCloud 7a29f1c0da runtime fix 2016-01-28 20:27:05 -05:00
Fox-McCloud cfa857cd35 Adds in Lichdom Spell 2016-01-28 18:57:00 -05:00
Aurorablade b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Crazylemon 07a62934e4 Brainmobs can no longer ethereal jaunt 2016-01-25 19:21:40 -08:00
Aurorablade 95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
Aurorablade 51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Crazylemon64 de13a4e4d3 Various Ragin' Mages fixes
* Additionally, increases the number of memes in the codebase
2016-01-13 21:56:56 -08:00
Fox-McCloud ebdd9d3897 Timestop Spell Port and Sepia Slimes 2016-01-06 03:30:08 -05:00
Aurorablade bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Fox-McCloud e38417cebe Electrocution Refactor+Electric Reagents 2015-12-31 17:28:27 -05:00
Aurorablade b58ed5a9d4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-26 22:18:09 -05:00
Fox-McCloud 5069d949bd Ports TG's Tesla Engine 2015-12-24 00:40:20 -05:00
Aurorablade 046b0b997d almost.... 2015-12-23 11:40:16 -05:00
Aurorablade 80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
Tastyfish 85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Tigercat2000 4f3938d68b -tg- buckling system
This commit overhauls a bunch of systems so that buckling works for
any subtype of /obj. This means that space vines and chairs and beds all
use the same system. A lot of stuff has been touched.
2015-09-24 15:52:10 -07:00
DZD 61a9a87232 Lightning bolt spell progress bar 2015-09-12 19:43:23 -04:00
Tigercat2000 7f4ac72910 Progress bars + Wall Rationalization
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
DZD f3970fb304 Wizard touch attacks and fixes
- Flesh to Stone and Disintegrate are now actual touch attacks.
- Fixes issue with in-hands and back sprites missing for the staff of
animation.
- Fixes missing right-handed in-hand for the staff of healing.
2015-08-20 10:21:45 -04:00
DZD 93df90d09f Lightning Bolt Buff
- Now always bounces 5 times (for a total of 6 hits).
- Now always does at least 15 damage per hit, with a maximum of 50.
- Now affects people wearing insulated gloves, tough luck if they're wearing an fully insulated chest-covering armor though.
2015-08-09 18:58:53 -04:00
DZD 16bdb00351 Nukes useless /wizard/ spell pathing
This had no fucking reason to exist, Shadowling spells are not wizard
spells, genetics powers are not wizard spells, ghost Booing is not a
wizard spell, etc.
2015-08-08 14:06:50 -04:00
Fox-McCloud 54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud 9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit
Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm
2015-06-22 13:40:07 -07:00
Tigercat2000 d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00