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
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
537 Commits
Author SHA1 Message Date
PsiOmegaDeltaandYoshax c6105e01a0 Adds missing error handler that made it difficult to debug runtimes. 2016-08-25 18:21:55 +01:00
killer653 d1afae6d06 Polaris Sync & bugfix 
- Polaris Sync
- Fixes bug being unable to pick up micros
- Fixes all conflicts that came with sync
 2016-08-17 22:02:05 -04:00
NullSnapshotandYoshax e881c77c8f refactors admin faxes to allow for more simple to use fax creation and replying. 
Admins also gain the ability to initiate faxes.
And mods can send and receive faxes now.
 2016-08-12 19:58:52 +01:00
Eearslya 85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
Jon 88debefe3e The Beruang can now sent to visit the station once per round, with traders gathered, in the same manner as the admin ERT call! 2016-07-08 16:07:34 +01:00
Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink 
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
 2016-05-29 16:22:07 -04:00
Datraen 9e09720be5 Final Initial Implementation of Xenobio2 System. 
Kinks worked out, everything is functioning as it should.
 2016-05-25 14:11:37 -04:00
Leshana e86d0a0ccb Added Change CKey Admin Verb 
In order to let a broader range of admins set the ckey of mobs without
breaking things, this verb allows setting the ckey of mobs only to
currently-online players.
 2016-05-20 20:43:36 -04:00
AtlantisandYoshax e8a4f57bcf Adds full atmospherics reset admin verb 
- Adds "Fix Atmospheric Problems" verb, that is accessible to server admins.
- This verb will perform full reset of atmosphere. Unlike reboot-zas this fixes any possible griefs or bugs, by completely purging all existing gases and resetting them to roundstart values.
 2016-04-10 17:23:43 +01:00
EmperorJon 66b731783f Merge pull request #1386 from Datraen/BetterStealthmin 
Changes mob names of admins that stealth while in lobby.
 2016-04-09 18:35:55 +01:00
Datraen 2e0fdafc37 Changes mob names of admins that stealth while in lobby. 2016-04-01 16:57:24 -04:00
Datraen 91a6c51ed2 Adds toggle verbs and procs. 2016-03-31 16:42:13 -04:00
Yoshax d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Kelenius e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Yoshax 5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Datraen fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup 
Changes types of ghosts and eyes
 2016-03-18 13:50:47 -04:00
Kelenius 1cd71da6ed Fixes one stay missed line 2016-03-11 12:02:01 +03:00
Kelenius 3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Kelenius acc78a8000 Changes types of ghosts and eyes 
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
 2016-02-20 15:36:05 +03:00
Zuhayr a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Datraen 9471955904 Adds amount of telecrystals to set verb, adds a telecrystal addition verb. 2016-02-18 11:11:04 -05:00
Zuhayr 7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr 98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Neerti f2cd67fe16 Merge pull request #810 from Zuhayr/bayupdate 
Bay update.
 2016-02-05 23:21:07 -05:00
Kelenius b86c730695 Removes the old virus system 
Appendicitis moved to appendix organ
 2016-01-27 11:44:41 +03:00
Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Datraen 0c4c3b7add Gives mods AOOC, fixes AUTOAUTOTRAITOR. 2016-01-05 18:12:56 -05:00
Datraen c19d735e7b Adds more accesses to things. 2016-01-02 22:19:44 -05:00
Datraen f3a60c054c Gives mods access to direct narrate. 2016-01-02 21:25:09 -05:00
GinjaNinja32 7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
Zuhayr d71573e749 Further work on properly integrating, updating and fixing prosthetic options. 
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
 2015-12-24 21:10:33 +10:30
DatraenandPsiOmegaDelta c5912b988c Adds a paralyze button for easy administration. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:56:48 +01:00
Datraen d2eba4610f Adds a paralyze button for easy administration. 2015-12-20 14:20:09 -05:00
PsiOmegaDelta f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
 2015-12-13 10:15:29 +01:00
Neerti 64a5290711 Adds set_tcrystals() to hidden adminverb list. 
As requested by Datraen.
 2015-12-12 19:38:41 -05:00
SkyMarshal d10118e3d0 Fixes #11346 
Fixes #8123

Removes adminbus ability to call down the Icarus... because it's pretty broken.
 2015-12-12 12:03:15 -07: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
Datraen 6f6cb4661f Merge branch 'master' into Devtweaks 2015-11-29 22:36:08 -05:00
Datraen 3506e0861c Fixes jumping, adds dev access to msay and ahelps. 2015-11-29 22:34:00 -05:00
Neerti 75c574eddd Adds verb to toggle hub visibility. 2015-11-29 22:06:05 -05:00
PsiOmega 63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
 2015-09-27 13:36:56 +02:00
HarpyEagle 380b89fcc0 Fixes #11130, renames aghosted var 
because it is no longer used solely for aghosting.
 2015-09-26 20:48:13 -05:00
GinjaNinja32 be2279106f Merge remote-tracking branch 'upstream/dev' into vv 
Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/admin/view_variables/topic.dm
 2015-09-10 03:06:27 +01: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
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 58cd8c3e03 Added debug verbs/feedback. 2015-09-05 12:05:32 +09:30
PsiOmega 35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-08-29 10:06:18 +02:00