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
Tigercat2000
34d0bdc946
Fix exploit to get around delay, change to notice instead of warning
2015-04-07 02:26:25 +02: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
Tigercat2000
3681914d25
Thiiis is what I get for assuming obj/machinery is anchored by default
2015-04-06 13:52:42 +02: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
ca7c6f9db7
Merge pull request #734 from tigercat2000/SuicideActs
...
Adds the most important suicide_act (Toy Katana)
2015-04-05 19:03:35 -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
430e08574b
Merge pull request #729 from SamCroswell/PosterUpdate
...
Poster update
2015-04-05 19:02:46 -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
fcf6f268ee
I can type, I swaer!
2015-04-05 23:44:22 +02:00
Tigercat2000
d9613e7a25
Adds the most important suicide_act
...
Lolzy suicide_act for the replica katana, as requested by nomzy-xilia
2015-04-05 22:12:47 +02: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
SamCroswell
8485ae4bab
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into PosterUpdate
2015-04-04 23:05:18 -04:00
SamCroswell
57703695ed
Poster Rework Part 3
2015-04-04 23:04:45 -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
ZomgPonies
1628202202
Merge pull request #724 from tigercat2000/ProcessorCleanup
...
Cleanup food processor code
2015-04-04 14:06:46 -04:00
ZomgPonies
e4816d2571
Merge pull request #721 from tigercat2000/PicketPort
...
Adds Picket Signs (Port from -tg-)
2015-04-04 14:04:59 -04:00
ZomgPonies
98be74aeb6
Merge pull request #723 from Fox-McCloud/science-rebalance
...
Science Department Restructuring---Xenobotany
2015-04-04 14:04:47 -04:00
Fox-McCloud
ddba1a418a
[Goonchem] Tweaks
2015-04-04 07:46:00 -04:00
