Commit Graph

20154 Commits

Author SHA1 Message Date
FalseIncarnate aaeccfdff5 Removes the force from tickets
Tickets no longer deal damage when used as a weapon or thrown.
2016-02-15 02:36:18 -05:00
FalseIncarnate f44602ab79 Src, Spans, and Chainsaws
Cleans up some src and src.loc in the toys, arcade, and prize counter
files

Replaces some text macros with proper spans

Removes the attack proc from the toy chainsaw, preventing them from
making sounds on hit.
- Still makes the revving sound when you wield them
2016-02-15 02:32:29 -05:00
FalseIncarnate 0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
FalseIncarnate 954d0dadfa Prize Counter WIP commit 2016-02-12 00:32:21 -05:00
TheDZD 5df91c7e1f Merge pull request #3557 from Fox-McCloud/spell-icons-fake-nath
Updates Fake Disintegrate and Spell Icons
2016-02-11 18:09:12 -05:00
TheDZD 2a64ec8433 Merge pull request #3559 from Crazylemon64/raginger_mages
Makes mages more ragin
2016-02-11 18:07:27 -05:00
TheDZD be48d10159 Merge pull request #3554 from Fox-McCloud/timer-process
Ports TG's Timer Controller
2016-02-11 18:05:50 -05:00
Fox-McCloud 412952e2c6 wait for it 2016-02-11 05:06:25 -05:00
TheDZD 3f987008cb Merge pull request #3556 from Crazylemon64/follow_all_the_things
Lets you ghost-follow any movable atom
2016-02-10 22:20:50 -05:00
Fox McCloud f7b40b6753 Merge pull request #3567 from TheDZD/i-can't-colors
Fixes DZD Being Colorblind
2016-02-10 20:20:08 -05:00
TheDZD 07c63d7848 Fixes DZD being colorblind
I accidentally made mentorhelps the same color as mentor OOC, whoops.
2016-02-10 20:09:56 -05:00
TheDZD d704054d67 Merge pull request #3551 from Fox-McCloud/auto-reload
Kinetic Accelerators Auto-Reload
2016-02-10 18:36:22 -05:00
Fox McCloud c0899deeb0 Merge pull request #3555 from TheDZD/master
Jobban Tweaks
2016-02-10 17:22:39 -05:00
Fox McCloud 9afddc2e06 Merge pull request #3552 from Crazylemon64/fixes_ai_power_hacking
Revamps that weird dialog about hacking the nearest APC to actually work
2016-02-10 17:21:50 -05:00
Crazylemon64 3689eb88ea Makes mages more ragin
Also lets admins change the max_mages more flexibly - either through
players_per_mage, which it sticks to by default, or max_mages if set
2016-02-10 00:39:20 -08:00
Fox McCloud 4b973163a6 Merge pull request #3548 from Spacemanspark/Spark-plays-too-much-Pokemanz
Adds Pokemon to the game.
2016-02-10 00:51:11 -05:00
Fox-McCloud 5f2b5f1fde Updates Fake Disintegrate and Spell Icons 2016-02-10 00:01:37 -05:00
Fox-McCloud ba5433476e faster loop 2016-02-09 22:40:33 -05:00
TheDZD a346ece1c4 You'd have to be blind to miss this. 2016-02-09 22:14:33 -05:00
Crazylemon64 b3c795f8fc Lets you follow any movable atom 2016-02-09 18:33:13 -08:00
TheDZD 4d0e8bb5e2 GET MAD 2016-02-09 18:12:47 -05:00
Fox McCloud 9ec6286446 Merge pull request #3550 from Tastyfish/tables3
Fixed extra table legs
2016-02-09 17:57:32 -05:00
Fox McCloud e06fe2bb8d Merge pull request #3549 from Crazylemon64/fix_the_black_walls
Walls will no longer become completely black when exploded
2016-02-09 17:57:20 -05:00
TheDZD 5a8ffbd198 Jobban Tweaks 2016-02-09 16:35:30 -05:00
Fox-McCloud 80ae2796b7 Ports TG's Timer Controller 2016-02-09 08:45:56 -05:00
Fox McCloud 403c4ec22e Merge pull request #3539 from VampyrBytes/Bolas
Bolas now affect walking people
2016-02-09 06:09:49 -05:00
Crazylemon64 1ba299b289 Revamps that weird dialog about hacking the nearest APC to actually work 2016-02-09 00:59:49 -08:00
Spacemanspark 5aa671b630 Fixes indents. 2016-02-09 01:41:22 -06:00
Fox-McCloud 0561987ed8 Kinetic Accelerators Auto-Reload 2016-02-09 02:21:19 -05:00
Crazylemon64 bcdaedb01e Walls will now smooth and explode properly 2016-02-08 23:08:36 -08:00
Spacemanspark b6b3204bf7 Makes Mob Capsule code better. 2016-02-09 01:02:25 -06:00
Tastyfish 13cf94c2f3 herp 2016-02-09 01:58:17 -05:00
Tastyfish ca5d48487f Fixed tables... again 2016-02-09 01:09:32 -05:00
Spacemanspark 24afe14a12 Adds in mob capsules 2016-02-08 23:40:53 -06:00
Fox McCloud a39fa8eaca Merge pull request #3486 from TheDZD/halp-george-malons-is-griffin-meh
Renames Adminhelp Categories
2016-02-08 21:37:02 -05:00
TheDZD 3a9e13fdae Merge pull request #3527 from Fox-McCloud/syndi-donk
Tweaks Syndicate Donk Pockets
2016-02-08 21:34:12 -05:00
TheDZD e9d9e3b3e6 Colors! 2016-02-08 21:25:14 -05:00
Crazylemon 951f25a14d Fixes emagging an R&D console 2016-02-08 17:06:59 -08:00
Fox McCloud 7ee63b1e3b Merge pull request #3538 from Tastyfish/cuccumb
Fixed succumb for weird living mobs and maxHealth
2016-02-08 20:04:04 -05:00
Fox McCloud fbb7714f41 Merge pull request #3532 from Crazylemon64/more_simple_animal_gibs
Lets you gib butterflies and lizards for keks
2016-02-08 20:01:38 -05:00
VampyrBytes f307e9c700 Fixes span closure in vamp regen
Fixes my <span> cockup in #3541
2016-02-09 00:45:42 +00:00
Fox McCloud 05ba314d1b Merge pull request #3530 from Robertha89/patch-6
add tesla to supplypacks
2016-02-08 18:26:27 -05:00
Fox McCloud e116dd3cfe Merge pull request #3541 from VampyrBytes/VampPassives
Fixes Vamp Passives (#2812)
2016-02-08 18:23:04 -05:00
TheDZD fa0307f680 Merge pull request #3540 from Robertha89/patch-3
Adds head patting
2016-02-08 18:05:20 -05:00
VampyrBytes e526753c75 Fixes Vamp Passives (#2812)
Fixes Vampire thermal vision
Improved regen was working, but the message was commented out due to
spam, it now shows without spamming
2016-02-08 20:44:04 +00:00
Robertha89 df963a6aa5 Adds head patting 2016-02-08 13:35:26 +01:00
VampyrBytes 8e627b384c Bolas now affect walking people
As per #3509 bolas no longer require a running stance to trip people
2016-02-08 10:10:37 +00:00
Tastyfish bb0da27fac Optimized div2 2016-02-08 05:02:41 -05:00
Tastyfish 4f40472604 Fixed succumb for weird living mobs and maxHealth 2016-02-08 03:54:58 -05:00
Robertha89 15e37b498c Removes a grounding rod 2016-02-07 23:07:59 +01:00