Commit Graph

9156 Commits

Author SHA1 Message Date
Fox-McCloud d514b79fc2 Merge pull request #747 from ZomgPonies/multikey
Alt Account checking
2015-04-07 23:15:14 -04:00
ZomgPonies c01b66b787 Merge pull request #749 from Fox-McCloud/more-reagents
[Goonchem] More reagents
2015-04-07 15:49:04 -04:00
Fox-McCloud dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
Fox-McCloud ddc3604442 Merge remote-tracking branch 'upstream/master' into more-reagents 2015-04-07 01:15:06 -04:00
Fox-McCloud 68a8340b23 [Goonchem] More Reagents 2015-04-07 01:03:15 -04:00
ZomgPonies 4e9daf6aa8 Merge pull request #746 from jack-fractal/write-research-debug
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
ZomgPonies cb987d3692 Alt Account checking 2015-04-06 23:12:15 -04:00
jack-fractal 5c85b48672 Switching the verb to Debug
Verb should be in Debug
2015-04-06 22:12:18 -04:00
jack-fractal a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
jack-fractal 1da136bd94 Adding debug command
Adding the ability for Admin's to write out a json file full of debug
info for the Research and Development system.
2015-04-06 19:06:16 -04:00
ZomgPonies f767cfa460 Merge pull request #741 from SamCroswell/TDomeUpdate
Thunderdome Update
2015-04-06 18:16:30 -04:00
Fox-McCloud 46f2b24a75 Merge pull request #744 from ZomgPonies/limb
Organs/Surgery Fixes
2015-04-06 18:15:56 -04:00
ZomgPonies 81c5451944 Merge pull request #736 from Fox-McCloud/tator-bottle
[Goonchem] Poison Traitor Bottles
2015-04-06 18:13:40 -04:00
ZomgPonies 85a8a7a35f Fixes cane speed exploit 2015-04-06 18:09:52 -04:00
ZomgPonies 187e0d38f4 Fixing organ data stuff in DB 2015-04-06 17:15:08 -04:00
ZomgPonies 2de3b7148a Fixed being able to switch surgery targets mid-step 2015-04-06 17:05:48 -04:00
SamCroswell 5d1ce61a7d Various Fixes 2015-04-06 12:39:14 -04:00
SamCroswell 69c788449b Thunderdome - Create Teams Button 2015-04-06 11:59:02 -04:00
SamCroswell e6a6803e24 Thunderdome - Reset Thunderdome Button 2015-04-06 11:22:21 -04:00
Fox-McCloud e1db537443 [Goonchem] Poison Traitor Bottles 2015-04-05 23:37:41 -04:00
Fox-McCloud 340451ba5c anti-meta 2015-04-05 22:08:03 -04:00
Fox-McCloud 9ca8def744 [Goonchem] Fixups 2015-04-05 21:56:59 -04:00
Fox-McCloud 7c739e4745 Merge pull request #710 from ZomgPonies/limb
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
ZomgPonies 2684a2b999 Merge pull request #733 from tigercat2000/StahpSpawningSpessworm
Prevent life reagent from spawning spaceworms
2015-04-05 19:02:55 -04:00
ZomgPonies 3e5ccfd99e Merge pull request #728 from TheDZD/minor-fixes
Mute Changes
2015-04-05 19:02:34 -04:00
ZomgPonies e733d1caf0 Merge pull request #730 from Fox-McCloud/tweaks-and-tweaks
[Goonchem] More Additions and Tweaks
2015-04-05 19:02:18 -04:00
ZomgPonies 9dfe308b3d Derp 2015-04-05 18:53:10 -04:00
ZomgPonies 1719df1be2 Fox balancing 2015-04-05 18:51:09 -04:00
Fox-McCloud fb03e1bc88 updates 2015-04-05 17:54:48 -04:00
Tigercat2000 1bc73bd054 Prevent life reagent from spawning spaceworms
Spaceworms are specifically designed as an adminbooze mob- they are NOT
currently balanced to be spawned by any reactions or such. They even can
qdel things that they eat.
2015-04-05 21:06:44 +02:00
ZomgPonies cafbb8035c microfix 2015-04-05 14:47:51 -04:00
Fox-McCloud f977b62724 few more tweaks 2015-04-05 05:24:14 -04:00
Fox-McCloud afb8626670 [Goonchem] More Additions and Tweaks 2015-04-05 03:18:18 -04:00
ZomgPonies 91cb7b8b32 Final fixes 2015-04-04 23:30:49 -04:00
VelardAmakar 4dc73ce9af Added ~15~ 12 new hair options courtesy of Fury McFlurry 2015-04-05 04:20:26 +02:00
ZomgPonies c23f2019fe Merge pull request #725 from Fox-McCloud/brain-damage
Lethal Brain Damage
2015-04-04 22:07:39 -04:00
DZD 1fa2c164f9 Mute Changes
- R_MOD is now needed to mute players.
- Admins/mods/mentors can now be muted. The first two can unmute
themselves, the third cannot.
- Global OOC mute now applies to mentors as well, but not to admins or mods.
- Global Deadchat mute still only applies to regular players.
- Mods using DSAY will show up as MOD instead of MENTOR.
2015-04-04 20:05:42 -04:00
ZomgPonies 91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud ddba1a418a [Goonchem] Tweaks 2015-04-04 07:46:00 -04:00
Fox-McCloud 1a81836556 Lethal Brain Damage 2015-04-04 01:51:04 -04:00
Fox-McCloud ff5ec1df54 meh 2015-04-03 05:32:53 -04:00
Fox-McCloud 0efdc07191 [Goonchem] Few Recipes Tweaks 2015-04-03 01:25:42 -04:00
ZomgPonies d4a658ba48 Merge pull request #715 from Fox-McCloud/few-reagents
[Goonchem] Few New Reagents
2015-04-02 21:32:28 -04:00
Fox-McCloud 5bb830771d fix-ups 2015-04-02 19:54:01 -04:00
ZomgPonies c3a2916d85 Merge pull request #711 from tigercat2000/Spesswormoverhaul
Spaceworm overhaul (-tg-port)
2015-04-02 14:07:41 -04:00
Fox-McCloud 3bcbd2488c [Goonchem] Few New Reagents 2015-04-02 05:04:20 -04:00
ZomgPonies 6ad9603d1b Merge pull request #713 from FalseIncarnate/master
Custom Items - Diemos Vezzati
2015-04-01 23:09:12 -04:00
Tigercat2000 e05ff3335f add factions 2015-04-02 03:28:41 +02:00
Fox-McCloud cd5649e522 Fixes Dead People Vomitting 2015-04-01 19:29:06 -04:00
FalseIncarnate 85d805b2ba Fixes item path
Now properly denotes the blue mask as a fluff item in it's path.
2015-04-01 03:58:52 -04:00