cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 8 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

8480 Commits

Author SHA1 Message Date
Ccomp5950
da3ad0a6db Merge pull request #7099 from Amunak/endgame-info 
Added round end summary (attempt 2)
 2014-11-22 03:28:38 -05:00
Ccomp5950
d0383883c2 Merge pull request #7094 from Neerti/borg_hud_port_2 
Semi-ports /tg/'s cyborg HUD, now with less merge conflict!
 2014-11-22 03:27:10 -05:00
Ccomp5950
93ac9115a5 Merge pull request #7093 from PsiOmegaDelta/Tracking 
AI can now track people with max level sensors.
 2014-11-22 03:25:59 -05:00
ccomp5950
eb83d5ccec Solves a runtime when someone tries to mop up blood. 
proc name: afterattack (/obj/item/weapon/mop/afterattack)
  source file: mop.dm,45
runtime error: undefined proc or verb /obj/effect/decal/cleanable/blood/tracks/footprints/clean().
 2014-11-22 03:02:40 -05:00
Zuhayr
1c35f8825b Dummied out the AI movement code for a later project. 2014-11-22 08:04:06 +10:30
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
Segrain
7f199874fb Examining robomodules. 2014-11-21 19:28:46 +03:00
PsiOmega
71064574ed Merge remote-tracking branch 'upstream/dev' into AirAlarms 
Conflicts:
	code/game/machinery/alarm.dm
 2014-11-21 15:28:54 +01:00
PsiOmega
59aa4dfcc6 ERT and Xenobiology security HUD icons 
Treats ERT members as officially recognized Central Command personnel.
Adds missing Central Command secHUD icon. Adds a temporary icon for Xenobiologists.
 2014-11-21 14:46:54 +01:00
Amunak
5dab47c156 Updated the end of round messages for better fit 2014-11-21 13:35:41 +01:00
GinjaNinja32
116705b61b Fixes wallets, makes CMC use alt-titles, actually remove dead block 2014-11-21 10:42:52 +00:00
Amunak
c6211b0eca Fixed missing space in the printplayer proc output 2014-11-21 11:29:29 +01:00
Amunak
0743e0ddb3 Round end summary now shows full player list and more round information 2014-11-21 11:28:40 +01:00
GinjaNinja32
fe1700eabc CMC can now get names from PDAs, and doesn't report Random Assistant's ID Card (Assistant) 2014-11-21 09:30:11 +00:00
PsiOmega
2a796f2ddd Merge remote-tracking branch 'upstream/master' into dev 2014-11-21 10:27:56 +01:00
Neerti
72c9b2eb15 Resolves conflicts, cherrypicks my code. 2014-11-21 03:32:00 -05:00
PsiOmega
84b36f6208 AI can now track people with max level sensors. 
Crew members with tracking sensors enabled can now be tracked without the need of camera coverage.
 2014-11-21 08:33:20 +01:00
PsiOmegaDelta
350273dea4 Merge pull request #7071 from Segrain/dev 
Equipping custom loadout.
 2014-11-21 08:03:24 +01:00
PsiOmegaDelta
34e0019dad Merge pull request #7085 from Hubblenaut/hud 
MedicalHUD takes hardcrit in account
 2014-11-21 08:02:31 +01:00
PsiOmegaDelta
921815df04 Merge pull request #6906 from mwerezak/faxmachine 
Fax Machines
 2014-11-21 08:02:21 +01:00
mwerezak
348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine 
Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm
 2014-11-20 14:57:35 -05:00
Hubblenaut
aeda763e81 MedicalHUD takes hardcrit in account 2014-11-20 18:42:17 +01:00
Atlantiscze
3003777b6a Adds mwerezak's suggestions 
- Power monitor is now /computer/ subtype
- Different rounding of values in power monitor display
- Unfortunately, PDA power monitoring for engineers is broken and probably won't be fixed as it relies on old powernet monitoring computers. Laptops work OK
 2014-11-20 16:24:26 +01:00
Atlantiscze
20571bf1ce Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 14:38:04 +01:00
PsiOmega
2fddc6a832 Less copy-pastah 
Reduces copy-pasted code in the atmospheric monitor computer code.
 2014-11-20 13:18:07 +01:00
Chinsky
614bb589c2 Merge pull request #7064 from PsiOmegaDelta/CanisterLogs 
Canister Logs
 2014-11-20 14:55:19 +03:00
Chinsky
3f80ee89d2 Merge pull request #6889 from PsiOmegaDelta/APC 
BYOND akbar
 2014-11-20 14:51:30 +03:00
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01:00
Chinsky
af6a262a2c Merge pull request #7059 from PsiOmegaDelta/Headsets 
Dynamic Headset Description
 2014-11-20 02:41:08 +03:00
Chinsky
8015bb55f8 Merge pull request #7070 from Amunak/airalarm-fix2 
fixed a bug that made it impossible for AIs to change air alarm sensor settings
 2014-11-20 02:40:04 +03:00
Segrain
a475247f11 Proper slot equipment. 2014-11-19 18:35:44 +03:00
Segrain
77ba15aea5 Slot_tie flags. 2014-11-19 18:29:51 +03:00
Amunak
05357f3850 Fixed a bug that made it impossible for AIs to change air alarm sensor settings 2014-11-19 15:56:42 +01:00
PsiOmega
c45f77f247 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-19 14:40:18 +01:00
Ccomp5950
088c86f692 Merge pull request #7065 from Zuhayr/combitool 
Added combi-tool.
 2014-11-19 08:37:15 -05:00
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
Zuhayr
660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
Zuhayr
f14c1e4402 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-11-19 23:17:48 +10:30
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
Zuhayr
0f0bca6889 Merge pull request #7038 from mwerezak/diona-scream 
Fixes #7026
 2014-11-19 23:11:50 +10:30
Zuhayr
f3b4dfced1 Merge pull request #7034 from PsiOmegaDelta/ERT-Records 
Security Records Check
 2014-11-19 23:10:48 +10:30
Zuhayr
cbc9895979 Merge pull request #7057 from atlantiscze/robofix 
Cyborgs can now modify airlock electronics accesses.
 2014-11-19 23:09:36 +10:30
Zuhayr
c11cb65e19 Added combi-tool. 2014-11-19 23:04:09 +10:30
Atlantiscze
61990872d8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-19 13:15:40 +01:00
PsiOmega
3155f3070f Canister Logs 
Opening a non-empty canister now produces an admin message, not only a log note on the canister itself.
 2014-11-19 12:34:50 +01:00
PsiOmega
45c5f01363 Dynamic Headset Description 
Headsets now generate a description of available radio channels based on the installed encryption key(s).
Currently only updates on creation, not when changing encryption keys, to ensure that less than legal keys are not detected by a mere casual glance.
 2014-11-18 18:43:12 +01:00
PsiOmega
f7bc35f333 Binary Tracking 
The AI can again finally track entities using the binary channel.
 2014-11-18 12:24:54 +01:00
Atlantiscze
89e3167ab7 Cyborgs can now modify airlock electronics accesses. 
- Fixes #6997
 2014-11-18 11:40:08 +01:00
PsiOmega
e78a9c3efe Merge remote-tracking branch 'upstream/dev' into Service 2014-11-17 12:00:01 +01:00
PsiOmega
cad3c76986 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-17 11:59:41 +01:00