Commit Graph

753 Commits

Author SHA1 Message Date
ZomgPonies
cb987d3692 Alt Account checking 2015-04-06 23:12:15 -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
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
SamCroswell
b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
Fox-McCloud
3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00
ZomgPonies
64bd0abd71 Fix mentors seeing MSAY 2015-02-26 21:41:59 -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
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
ZomgPonies
be80f74135 Revert "Fax and comms console event flag fix"
This reverts commit c399b6d276.
2015-02-20 14:22:22 -05:00
ZomgPonies
c399b6d276 Fax and comms console event flag fix 2015-02-20 12:46:27 -05: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
4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Mark van Alphen
b407810e07 Merge pull request #324 from ZomgPonies/rev
New +MENTOR permission for mentors
2015-02-18 16:15:44 +01:00
ZomgPonies
97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds
Sounds
2015-02-17 18:44:54 -05:00
Tigercat2000
4be671c80e In accordance with MarkvA's recommendation, switches 'world' to
'mechas_list'.
2015-02-17 18:17:10 +01:00
Tigercat2000
d23d8af778 Port of freeze mob verb from NSS Pheonix 2015-02-17 18:04:31 +01:00
ZomgPonies
e2060f405e Downgrade list of potential ahelp subjects to 2: Complaint or Question 2015-02-17 09:21:22 -05:00
ZomgPonies
efe13b39bd Remove msay from mentors 2015-02-17 09:12:43 -05:00
ZomgPonies
c218a2457f New +MENTOR permission for mentors 2015-02-17 02:28:00 -05:00
Fox-McCloud
a03879d83f Sound Updates 2015-02-16 16:29:43 -05:00
Markolie
8726bad5b0 Z-level check refactor 2015-02-16 20:33:28 +01:00
Markolie
ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Markolie
61e9fe3b28 Admin fax overhaul 2015-02-13 20:46:19 +01:00
Markolie
eb71439e7f Dodgeball 2015-02-13 01:28:55 +01:00
Markolie
8ebc090480 Fix vampire oversight 2015-02-13 01:13:09 +01:00
Markolie
493be57db3 Update one click antag panel 2015-02-13 01:12:41 +01:00
Fox-McCloud
c78368a3e8 Merge pull request #281 from ZomgPonies/master
[BALANCE][BUGFIX] Singuloth Knight item balance & Small Bugfixes
2015-02-10 21:35:48 -05:00
Markolie
64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00