cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 20:16:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,250 Commits 66 Branches 25 Tags
Upstream-Sync
Commit Graph
411 Commits
Author SHA1 Message Date
Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
GinjaNinja32 7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
PsiOmegaDelta 70b84d87a6 Tweaks permission rights. 2015-12-23 13:01:03 +01:00
DatraenandPsiOmegaDelta 65f68602e7 Adds a longer timer to paralyze, allows for other mobs to fall under this proc. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:57:43 +01:00
DatraenandPsiOmegaDelta c5912b988c Adds a paralyze button for easy administration. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:56:48 +01:00
Datraen f9c6c0549e Adds a longer timer to paralyze, allows for other mobs to fall under this proc. 2015-12-20 14:38:10 -05:00
Datraen d2eba4610f Adds a paralyze button for easy administration. 2015-12-20 14:20:09 -05:00
Neerti aa2285cfb5 Fixes admin check in new set_telecrystal proc. 2015-12-12 10:56:06 -05:00
Datraen ef0337fccf Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels. 2015-12-11 21:14:11 -05:00
Datraen 1886eaa066 Lets mods see and toggle attack logs. 2015-12-01 01:07:45 -05:00
Neerti 75c574eddd Adds verb to toggle hub visibility. 2015-11-29 22:06:05 -05:00
SinTwo 8d747eed8d Moderator Logs 2015-11-29 13:34:00 -05:00
Neerti 4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta 299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
 2015-10-16 13:02:59 +02:00
PsiOmegaDelta fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
Chinsky 0c474bc5a5 Merge pull request #11281 from mwerezak/autoantag 
Cleans up antag auto-spawning, adds checks for active antags
 2015-10-15 19:16:13 +03:00
PsiOmegaDelta d7b6784e28 Fixes law change logging. 
The "Show last X law changes" review window should now actually be useful, displaying AI law updates with time, user, and law change.
 2015-10-13 19:44:49 +02:00
HarpyEagle 241520f0bb Cleans up autospawn, now uses existing code for selecting and choosing 
candidates. Adds more debug messages, and removes unused code.
 2015-10-12 13:03:50 -04:00
Zuhayr 0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Zuhayr fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
 2015-09-07 11:31:19 +09:30
Zuhayr b9c01bf2f2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
 2015-09-07 11:17:06 +09:30
Chinsky 9533f2d154 Merge pull request #11026 from GinjaNinja32/announcement 
Improve formatting of admin announcements
 2015-09-07 01:02:36 +03:00
GinjaNinja32 5a335c9140 Improve formatting of admin announcements 2015-09-06 20:41:06 +01:00
PsiOmega 95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega 69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Zuhayr f74182680c Fixes autotraitor. 2015-09-05 13:15:30 +09:30
Zuhayr 7af1f27b28 More debug feedback. 2015-09-05 12:57:20 +09:30
Zuhayr 58cd8c3e03 Added debug verbs/feedback. 2015-09-05 12:05:32 +09:30
Zuhayr 553ac01552 Autotraitor cleanup. 2015-09-04 20:17:47 +09:30
Zuhayr 23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
 2015-08-21 20:27:48 +02:00
Zuhayr edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
PsiOmega d001489d14 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-21 18:59:19 +02:00
Zuhayr 3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
PsiOmegaDelta 120ce3f20c Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-20 14:16:35 +02:00
PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
 2015-08-13 08:09:28 +02:00
PsiOmegaDelta 39825d6810 Secret entries can now give a warning before being triggered. 2015-08-11 15:03:57 +02:00
PsiOmegaDelta 0ab507ccec Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-07-28 09:03:49 +02: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
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
PsiOmegaDelta 0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
PsiOmegaDelta 7f24dc948e Re-implements Admin secrets as datums. 2015-07-06 14:58:27 +02:00
PsiOmega 0adebcb2bf Admin secrets refactor. 
Turns the entries in the secret admin secrets panel into datums, which will make it much easier to add, edit, and remove new entries.
This initial commit only contains an initial proof of concept entry implementation and the supporting code. Next commit will contain all relevant entries.
 2015-07-05 20:56:29 +02:00
Zuhayr 48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
Zuhayr d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
PsiOmegaDelta b7c9969f87 Corrects mob reference. 2015-06-10 11:35:00 +02:00
PsiOmegaDelta b44da1ee42 Admin JMP now includes a link to EYE or BDY if any. 2015-06-10 11:08:31 +02:00
PsiOmega fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
 2015-06-07 10:51:41 +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
Chinsky e5a8eb2dfc Actually renames 'going' var. 
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
 2015-06-05 11:07:24 +03:00