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
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
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
7c739e4745
Merge pull request #710 from ZomgPonies/limb
...
Port of the BS12 limb overhaul
2015-04-05 19:06: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
SamCroswell
cdf14a47ea
CentComm Equip Update
...
- Death Commandos now actually use the Death Commando frequency.
- Death Commandos have had their medical kits replaced with nanite
hyposprays.
- CentComm officers now spawn with a pulse pistol on their belt as
opposed to the useless base parent egun they got before.
- Remove the NT Rep equip option, as it's already available under the
'as job..' option.
- Merge the Spec Ops and Death Squad officer equip option
- Fixes the madmin malt's hellwater having the wrong ID.
2015-03-28 20:09:49 -04:00
Fox-McCloud
38adfe06a0
Removes Recursive Explosions
2015-03-19 03:23:14 -04:00
SamCroswell
8477d382a7
Merge conflict Fix
...
Conflicts:
icons/mob/suit.dmi
2015-03-08 20:38:07 -04:00
Fox-McCloud
89f2aea30d
Insulated Gloves Fix
2015-03-08 19:12:35 -04:00
SamCroswell
8829a90709
NT Rep + Blueshield Uniform Change
2015-03-08 16:59:01 -04:00
Markolie
80a560d291
Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4
2015-03-08 19:05:36 +01:00
Markolie
b8b0fd13b8
Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/response_team.dm
maps/cyberiad.dmm
2015-03-08 18:54:13 +01:00
Fox-McCloud
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
Markolie
3fcfcbc7bb
Select equipment ERT jumpsuit
2015-03-04 19:48:30 +01:00
Markolie
e30d4cc35d
Merge branch 'master' of https://github.com/Markolie/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-03-04 19:34:21 +01:00
Markolie
9c54d2feaa
Central Command access rework
2015-03-04 16:36:17 +01:00
ZomgPonies
10ee512d22
Merge pull request #492 from SamCroswell/dave-NinjaDev
...
Removes Space Ninjas
2015-03-03 21:26:16 -05:00
SamCroswell
b8a9c902a1
Removes Space Ninjas
2015-03-02 19:05:44 -05:00
Markolie
82b96d305f
Bug fixes, update quick create object
2015-03-02 21:20:12 +01:00
ZomgPonies
6979cf6089
Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup
...
Chemistry Cleanup and Fixes
2015-03-01 23:08:16 -05:00
Fox-McCloud
3bed31e08c
Chemistry Cleanup and Fixes
2015-03-01 16:34:23 -05:00
Markolie
d7a2559065
Bug fixes galore
2015-03-01 20:35:07 +01:00
Mark van Alphen
d89c885a14
Merge pull request #435 from ZomgPonies/fixuns
...
Various fixings and additions
2015-02-27 18:22:35 +01:00
Markolie
20ac07de8d
Bug fixes
2015-02-27 17:51:57 +01:00
ZomgPonies
64bd0abd71
Fix mentors seeing MSAY
2015-02-26 21:41:59 -05:00
ZomgPonies
ba1f04e0a0
Bantime fixins
2015-02-26 09:12:32 -05:00
Mark van Alphen
f15f8fb5ae
Merge pull request #422 from ZomgPonies/master
...
GC fixes
2015-02-25 17:49:17 +01:00
ZomgPonies
710d60abda
GC fixes
2015-02-25 10:58:56 -05:00
SamCroswell
cd7b1a4075
ERT Rework - Part One
2015-02-24 09:47:44 -05:00
Markolie
3f51486ba4
Bug fixes, bot proces controller update
2015-02-24 01:40:43 +01:00
Markolie
72db213067
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/jobs/job/support.dm
code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
ZomgPonies
b0a3d7e1cc
Everyone should have check new players
2015-02-21 09:25:43 -05:00
ZomgPonies
07cdcb3cff
Merge pull request #367 from Markolie/master
...
Switch copytext and sanitize proc
2015-02-20 16:22:32 -05:00
Markolie
9fedfc7c62
Switch copytext and sanitize proc
2015-02-20 22:17:13 +01:00
ZomgPonies
bb1d0c7a71
IC fax & comms console wrong staff
2015-02-20 14:28:39 -05:00
Markolie
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
Tigercat2000
826ccaed70
Extra Freeze features- Prevent direct touching and pulling
2015-02-20 05:16:03 +01:00
Tigercat2000
4345506c9c
Merge branch 'master' of github.com:ParadiseSS13/Paradise into FreezeMob
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-02-20 03:52:58 +01:00
DZD
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
DZD
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
ZomgPonies
043a5e0e31
Merge pull request #331 from Markolie/master
...
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
ZomgPonies
69a7d19380
Compile fix & Latejoin heads get added to target lists
2015-02-18 16:27:46 -05:00
