cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,947 Commits 8 Branches 0 Tags
edcd9f5d7358d99533de7deababe8f406aa414d6
Commit Graph

217 Commits

Author SHA1 Message Date
PsiOmega
0bd41e604b Merge remote-tracking branch 'upstream/dev' into Backup 2015-08-30 15:55:10 +02:00
PsiOmega
e1aa20fda5 Radio changes. 
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
 2015-08-29 17:12:48 +02:00
Zuhayr
dfbdd79375 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev 2015-08-29 16:53:42 +09:30
Zuhayr
7d82e4850e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-29 16:53:07 +09:30
PsiOmegaDelta
85f32efa7a Players can now select their own language shortcut keys. 2015-08-26 15:15:54 +02:00
PsiOmegaDelta
5962656c1e Languages now use alternative prefix keys. 
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
 2015-08-26 13:17:57 +02:00
Zuhayr
23564bda0c Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess 
Synths now relies on access permissions as well.
 2015-08-24 17:45:10 +09:30
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
 2015-08-23 01:30:46 -04: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
Zuhayr
55c1331261 Merge pull request #10004 from PsiOmegaDelta/150703-AISight 
Active AI cores now provides camera coverage.
 2015-08-22 02:21:36 +09:30
Zuhayr
a234d8b096 Merge pull request #10022 from PsiOmegaDelta/150705-SecretAdminDatums 
Admin secret panel refactor.
 2015-08-22 02:18:39 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
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
c346b99371 Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess 
Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
 2015-08-20 12:42:51 +02:00
PsiOmegaDelta
c2e2252342 Synth access and icon update changes. 
Refactors how synthetics set their modules. On login, if appearance selection was initiated but not finalized, the selection options popup again. Fixes a long-standing issue of borgs being able to look like the standard module by loging out.
Ensures the syndicate agent IDs and syndicate borgs will always have the same initial access permissions.
Removes now unnecessary syndicate snowflake code from NanoUI.
Synths now utilize actual ids.
 2015-08-20 12:40:08 +02:00
Zuhayr
c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery 
Uplink Items - Part III
 2015-08-20 19:19:12 +09:30
PsiOmega
c43ce91a99 Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem 2015-08-19 18:25:41 +02:00
PsiOmegaDelta
f46fcfaf52 Adds more decals. Moving turfs now includes under/overlays. 2015-08-19 10:44:42 +02:00
GinjaNinja32
a9773207b2 Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-19 09:42:48 +01:00
mwerezak
d70f064b1b Adjusts phoron exposure to use body_parts_covered 2015-08-18 17:18:25 -04:00
HarpyEagle
651c2c6ba6 Species spawn_flags 
Moves some more species flags into a new spawn_flags var.
 2015-08-18 17:02:45 -04:00
GinjaNinja32
1957029890 HUD cleanup, human/monkey HUD now turns correctly with client.dir 2015-08-18 18:21:25 +01:00
PsiOmega
e92e819bd9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-18 18:29:01 +02:00
PsiOmega
8138815dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-18 18:05:16 +02:00
Zuhayr
0e4c2430d1 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-18 11:59:50 -07:00
Zuhayr
71214d859e Merge with master. 2015-08-18 11:31:10 -07:00
PsiOmegaDelta
74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-08-17 09:44:21 +02:00
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
Zuhayr
eccdfd8d9a Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-16 05:45:16 -07:00
Zuhayr
7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
PsiOmega
c51e208094 One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686. 2015-08-15 15:22:37 +02:00
mwerezak
4092b40ae5 Updates frag grenades to use bresenham, tweaks 2015-08-15 02:41:32 -04:00
PsiOmegaDelta
bc73de33b8 Id cards are now cool when examined. 2015-08-14 15:40:39 +02:00
PsiOmegaDelta
0380d5d9d4 Completes the feature where mercenaries can setup fake crew announcements and records. 2015-08-14 13:42:11 +02:00
PsiOmegaDelta
efef67a3e4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-13 09:11:05 +02:00
PsiOmegaDelta
1b10f78940 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-08-13 09:01:10 +02:00
Chinsky
3fd8627bd7 Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup 
Refactors gas analyzation.
 2015-08-13 07:23:10 +03:00
Chinsky
81932abb29 Merge pull request #9995 from PsiOmegaDelta/150630-AddingThatMissing24GHour0ItIsDrivingMeInsaneAlright 
Time padding.
 2015-08-13 07:23:05 +03:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
Neerti
95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-08-03 22:13:18 -04:00
PsiOmega
f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
 2015-08-01 19:45:42 +02:00
PsiOmegaDelta
7e6cb6f38c Compilation/definition fixes. 2015-07-31 10:05:42 +02:00
PsiOmegaDelta
c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-07-31 10:00:16 +02:00
Neerti
8152ce0676 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-07-29 03:45:53 -04:00
PsiOmegaDelta
5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
 2015-07-27 10:20:20 +02:00
Neerti
6eece8ac45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2 
Conflicts:
	.travis.yml
	polaris.dme
 2015-07-16 22:46:53 -04:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00
PsiOmegaDelta
9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +02:00
mwerezak
916c9972d9 Better num2hex 
More concise and readable, and faster too.
 2015-07-09 22:51:21 -04:00