cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,375 Commits 5 Branches 0 Tags
f2d3f7833b4aedc3ff170877afa26b09efec4cb7
Commit Graph

10470 Commits

Author SHA1 Message Date
PsiOmega
f2d3f7833b AIs can now use the crew monitor console for tracking. 
Due to balance concerns, the headache of handling fake identities, meta, etc., this only works for crew members with tracking sensors enabled.
 2015-03-17 10:11:18 +01:00
Den
a41434331f Add middle mouse button action for buildmode 
Middle Mouse Button on buildmode button= On/Off object type saying"
Middle Mouse Button on turf/obj        = Capture object type"
 2015-03-15 22:22:25 +02:00
Chinsky
1ead71a993 Merge pull request #8479 from Techhead0/dev 
More things in belts.
 2015-03-15 04:50:03 +03:00
Techhead0
10c81f8d22 Forgot a comma. 2015-03-14 15:04:09 -04:00
Techhead0
d4e46182af More things in belts. 
I widened the selection of things you can put in various belts. Most
notably, emergency gear in medical belts and botany gear in tool belts.
 2015-03-14 14:38:30 -04:00
PsiOmegaDelta
2925a296dc Merge pull request #8470 from Neerti/3-13-2015_borg_hotkeys 
Ports /tg/'s Cyborg Hotkeys
 2015-03-14 19:04:36 +01:00
Neerti
dc4d149832 Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys. 2015-03-13 21:41:23 -04:00
PsiOmega
190bff8b47 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-13 14:23:00 +01:00
PsiOmega
ac25b0a614 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-13 14:21:38 +01:00
PsiOmega
2efa9c78f0 Corrects pulling icon_states. 2015-03-13 11:02:18 +01:00
PsiOmega
0cc60870f5 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-13 09:31:03 +01:00
PsiOmega
ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
 2015-03-13 09:23:26 +01:00
Zuhayr
100ffe4966 Merge pull request #8451 from comma/master 
Fixes #8438
 2015-03-13 17:19:36 +10:30
Chinsky
64a94a5043 Fixes #8438 
Removed spawn based on suggestion, doesn't seem to cause that graphical glitch it was against.
 2015-03-12 17:00:53 +03:00
Zuhayr
b5419a1673 Merge pull request #8443 from Baystation12/master 
Master into dev-freeze.
 2015-03-11 19:37:19 +10:30
Chinsky
69a080e2d6 Merge pull request #8421 from Neerti/3_9_2015-examine-text-med 
Examine Tab Text: (Some) Medical Stuff
 2015-03-11 07:28:54 +03:00
PsiOmega
b00138aa42 Fixes #5787. 
The pull icon is now immediately displayed/hidden when one starts/stops pulling an objects.
Not stolen from https://github.com/tgstation/-tg-station/pull/8279.
 2015-03-10 18:01:27 +01:00
Neerti
e07f06d7f4 I shouldn't proofread when sleep deprived. 2015-03-10 10:55:14 -04:00
PsiOmega
533ccef0ab Robot code clean up and fixes. 
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
 2015-03-10 13:37:20 +01:00
PsiOmegaDelta
ff11ae9d54 Merge pull request #8426 from mwerezak/misc 
Penetrating bullets are now more likely to go through glass doors
 2015-03-10 09:26:11 +01:00
PsiOmega
a86c16b3e3 Fixes hydroponics update_icon() runtime. 
Rounding could cause plant maturation to have a value of 0.
 2015-03-10 08:16:20 +01:00
mwerezak
65a34943cd Penetrating bullets are now more likely to go through glass doors 2015-03-10 03:00:24 -04:00
PsiOmega
85641b46e5 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-10 07:58:25 +01:00
PsiOmegaDelta
56516d1ec5 Merge pull request #8419 from mwerezak/blazer 
Adds custom item for Von2531
 2015-03-10 07:11:18 +01:00
Chinsky
9c30024ca0 Merge pull request #8411 from volas/admin_stuff 
Some admin stuff
 2015-03-10 09:09:35 +03:00
Neerti
be0971e690 Adds sabiram's help text to the game. 2015-03-09 23:19:15 -04:00
Zuhayr
fb56784fcb Merge pull request #8408 from mwerezak/examine-fix 
Examine fix
 2015-03-10 09:30:51 +10:30
mwerezak
1150902c9f Adds custom item for Von2531 
Blue blazer loadout item
 2015-03-09 16:57:10 -04:00
Chinsky
7a066b3c69 Merge pull request #8418 from mwerezak/supply-pack 
More tweaks
 2015-03-09 23:28:15 +03:00
PsiOmegaDelta
78d67a717a Merge pull request #8384 from comma/spookycat 
Gave Runtime spirit-sensing capabilities.
 2015-03-09 21:17:23 +01:00
PsiOmegaDelta
668c4baee7 Merge pull request #8382 from comma/monkey_revenge 
Allows you to scoop monkeys up
 2015-03-09 21:17:03 +01:00
mwerezak
645910947b Adds orderable flaregun crate 
Mainly to make double-barrelled shotguns orderable.
 2015-03-09 16:00:49 -04:00
volas
5fa66b2a8a Changes to aooc 2015-03-09 22:59:52 +03:00
mwerezak
91d7dd7049 Adjusts item_state placeholders 
Tries to switch the current placeholders for something less awkward
looking. As well, the WT550 will no longer be mistaken for a pistol.
 2015-03-09 15:39:24 -04:00
Chinsky
ec9511c943 Merge pull request #8402 from PsiOmegaDelta/RemoteAir 
Fixes various alarm issues.
 2015-03-09 22:07:02 +03:00
PsiOmegaDelta
b09606d85c Merge pull request #8415 from mwerezak/runtimes 
More runtime fixes
 2015-03-09 17:51:59 +01:00
mwerezak
188c4491c7 Fixes xenoarch runtime 2015-03-09 12:20:08 -04:00
mwerezak
e840ba2d25 Fixes photocopier runtime 2015-03-09 12:12:31 -04:00
mwerezak
385ff4f2fa Examine tab modularity 
Also fixes antag info text sticking around if antag/observer status is lost
 2015-03-09 12:09:18 -04:00
mwerezak
6bfa4ef3d5 Fixes AI freelook runtime 2015-03-09 11:59:02 -04:00
volas
e4e8ef3392 Merge remote-tracking branch 'upstream/dev' into admin_stuff 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2015-03-09 18:11:10 +03:00
Zuhayr
b43aa4b2b4 Merge pull request #8409 from mwerezak/misc 
Tweaks for Z8, armour vests, merc blood packs
 2015-03-10 00:51:52 +10:30
volas
a9b30da7cc Small correction 2015-03-09 16:53:08 +03:00
volas
ca07914424 Ability to search bans by bantype 2015-03-09 15:15:08 +03:00
volas
59a113f91c Ability to search bans by ip and id, and also matches 2015-03-09 15:12:51 +03:00
errorage
64d6012399 Added the ability to define the ip and computer id for a manual ban (in the banning panel). This is so mirroring bans or banning people who were not online during the round in progress does not require admins to spawn a mob, set their variables and then ban the mob. 
If however an admin attempts to add a manual ban for a player who was present during the current round, a player who still has a mob somewhere in the game world, the proc will prioritize the mob's ip and computer id variables, not the things entered in the banning panel form.
 2015-03-09 15:08:47 +03:00
Chinsky
d8c2a36f9f Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance 
Mirror and ERT appearance improvement.
 2015-03-09 13:42:19 +03:00
volas
c7573a0d11 Antag-OOC 2015-03-09 12:19:50 +03:00
volas
2ad8d26aeb Play server sound verb for admins 2015-03-09 12:19:47 +03:00
Loganbacca
11d340f898 Projectile effects - Part 3 
- Fixes for turrets, rogue drones, and emitters
- Removed muzzle flash from chem darts
- Converted emitters to use spanclasses and have correct capitalization
 2015-03-09 22:17:34 +13:00