cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,781 Commits 5 Branches 0 Tags
55e41b9afd19e57d3d69e21d73c90b3b03ceddf1
Commit Graph

1564 Commits

Author SHA1 Message Date
PsiOmega
0e8ca3c82c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/player_notes.dm
 2015-07-29 11:57:17 +02:00
Chinsky
0a54797044 Merge pull request #10341 from GinjaNinja32/notes-format 
Changes show_player_info_irc to properly escape '%'
 2015-07-28 14:02:08 +03:00
GinjaNinja32
09a8f37d6c Changes show_player_info_irc to properly escape '%' 2015-07-28 10:59:51 +01:00
PsiOmegaDelta
0bf3c39095 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-07-28 07:59:49 +02:00
GinjaNinja32
40693fda5b Merge pull request #10335 from PsiOmegaDelta/150727-SpawnLog 
Adds admin message log to the spawn verb.
 2015-07-27 10:54:40 +01:00
PsiOmegaDelta
81c40c14b1 Compacts down the game panel spawn logging and makes it always notify admins. 2015-07-27 11:47:55 +02:00
PsiOmegaDelta
631c30732d Adds admin message log to the spawn verb. 
The spawn-verb no longer only makes an entry in the admin log but also messages admins, making it less sneaky.
 2015-07-27 11:24:44 +02:00
Zuhayr
64ccd8a048 Merge pull request #10269 from Mloc/lightwrite 
lighting work
 2015-07-27 11:41:14 +09:30
GinjaNinja32
0e71efea18 Changes player planel to always display key if present 2015-07-26 11:03:36 +01:00
PsiOmega
659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm
 2015-07-26 10:00:12 +02:00
Snapshot
a13467d8a4 Merge pull request #10286 from comma/tor 
Updates ToR list URL
 2015-07-24 17:31:15 -07:00
Chinsky
0753429740 Updates ToR list URL 2015-07-25 03:27:46 +03:00
Mloc
65ac3d97d0 Revert "get rid of mob.see_in_dark and species.darksight" 
This reverts commit 278a4c38ec.
 2015-07-22 15:14:40 +01:00
GinjaNinja32
efaf8659b8 Fixes usage of isAI() 2015-07-15 15:51:11 +01:00
Zuhayr
5e1ae26b74 Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze. 2015-07-14 05:19:01 +09:30
Zuhayr
cd380aba24 Removed the last few references to MODE, fixed some oversights with player_is_antag(). 2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2 Fixes #10129 2015-07-14 05:18:58 +09:30
GinjaNinja32
b04ed47e2f Merge pull request #10070 from Mloc/lightwrite-2 
Lighting overlay changes + optimizations
 2015-07-12 15:51:44 +01:00
PsiOmegaDelta
7b3759c1f3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/topic.dm
	config/example/config.txt
 2015-07-12 14:49:31 +02:00
Null Snapshot
5b30703d30 Should be the last fixes needed. 2015-07-11 04:22:36 -07:00
Null Snapshot
168f823c35 Fixed up the things pointed out by Ccomp5950. 2015-07-09 22:19:05 -07:00
Null Snapshot
49ea79d0b3 Added missing return. 2015-07-09 14:40:30 -07:00
Null Snapshot
87c8be10dd spans and grammar for topic.dm 2015-07-09 12:26:32 -07:00
Null Snapshot
909798a8ef Actual implementation of mod_can_(job_)tempban and mod_(job_)tempban_max 2015-07-09 12:11:27 -07:00
Mloc
278a4c38ec get rid of mob.see_in_dark and species.darksight 
They don't work with the current lighting system and cause weird artifacts.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-09 19:17:04 +01:00
PsiOmegaDelta
14acf43646 Merge pull request #10059 from Baystation12/master 
Dev-freeze
 2015-07-09 08:34:43 +02:00
ccomp5950
0f764d8779 Admins will no longer see stars when viewing faxes. 
If an admin wasn't human / ghosting / or a silicon mob they would see garbled text.
This uses the "force view" setting to 1 bypassing the check.

Fixes #10050
 2015-07-08 10:47:22 -04:00
PsiOmega
6e93b7d604 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/verbs/deadsay.dm
 2015-07-04 15:19:52 +02:00
ccomp5950
9bcc061d1f DSAY will now list that it's dsay in log instead of generic log_admin 2015-07-03 15:03:51 -04:00
PsiOmegaDelta
8fef02501c Merge pull request #9936 from mwerezak/fire 
Balances fire to work better with very low concentration phoron gas burning
 2015-06-26 13:34:21 +02:00
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmega
9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
 2015-06-14 10:35:29 +02:00
GinjaNinja32
8d0c7039df Changes to dsay 
- Adds dsay to list of +DEBUG verbs
- Changes dsay to use holder rank rather than trying to guess from rights
 2015-06-13 16:46:03 +01:00
PsiOmega
d989df7e8c Adds the Jump-To-X verbs to the list of debug verbs. 2015-06-13 09:53:32 +02:00
PsiOmega
c2f8e1242e Expands admin jump permissions, cuts down on superfluous feedback. 2015-06-13 08:44:58 +02:00
PsiOmegaDelta
a0dcb04768 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/player_notes.dm
	code/modules/admin/topic.dm
 2015-06-11 12:06:40 +02:00
PsiOmega
2bd0d7a2f4 Automatic player note fixes. 
Player notes should now properly include the relevant admin's ckey.
Automatically adds temporary and permanent bans to the player's notes.
 2015-06-10 17:56:31 +02:00
PsiOmegaDelta
e7faa19ea3 Merge pull request #9779 from Baystation12/master 
Dev-freeze.
 2015-06-10 11:04:54 +02:00
PsiOmega
581c9b1308 Fixes admin jumps. 
Changes the checks and message target around, now targets usr instead of src.
 2015-06-09 20:14:05 +02:00
PsiOmegaDelta
97f49bb982 Merge pull request #9756 from Baystation12/master 
Dev-freeze
 2015-06-09 12:12:40 +02:00
PsiOmegaDelta
ec68454f63 Fixes #9753. 
Being admin jumped or jumping to another location now cancels ghost tracking.
Also adds proper permission checks.
 2015-06-09 08:55:12 +02:00
PsiOmegaDelta
2e920bce69 Merge pull request #9711 from mwerezak/syringelog 
Syringe gun logs, logging helper reorganization
 2015-06-07 09:00:21 +02:00
mwerezak
0725b0cc3e Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments 2015-06-06 11:53:12 -04:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
PsiOmega
086517f988 Closes a span class. 
Has somehow gone unnoticed until now.
 2015-06-03 17:57:57 +02:00
PsiOmegaDelta
fcb0841646 Reduction of admin right-click verbs. 
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627.
Fixes #9628.
 2015-06-02 14:20:14 +02:00
PsiOmegaDelta
4a976e1ee2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-02 13:13:40 +02:00
PsiOmegaDelta
e70faa20ee Merge pull request #9629 from GinjaNinja32/spawn 
Spawn fixes
 2015-06-02 08:05:54 +02:00