cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 8 Branches 0 Tags
014729a001b51af3a665684fbe68a3c3e3489ef1
Commit Graph

16446 Commits

Author SHA1 Message Date
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
Hubblenaut
b52aef132e Harm Intent Unarmed Melee Changes: More diverse logs, effects 2014-11-19 11:25:15 +01:00
mwerezak
4377ada588 Implements custom item for Foxler, fixes simple_animal emotes. 2014-11-18 16:19:59 -05:00
PsiOmegaDelta
76aa84ee6e Merge pull request #7058 from PsiOmegaDelta/BinaryTracking 
Binary Tracking
 2014-11-18 18:55:20 +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
Ccomp5950
61745c68c2 Merge pull request #7053 from DJSnapshot/adminfeatures 
I forgot a thing
 2014-11-18 09:30:33 -05: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
6918b0bca6 Multiple Law Statements 
Synths can now report laws on multiple channels at the same time.
 2014-11-18 10:19:21 +01:00
PsiOmegaDelta
9b98d08d60 Merge pull request #7003 from mwerezak/window-fix 
Fixes #6702 and cleanup
 2014-11-18 08:15:47 +01:00
PsiOmega
080f568df2 Merge remote-tracking branch 'upstream/dev' into Pipes 2014-11-18 07:57:50 +01:00
Atlantiscze
16685f0698 Fixes renwick shield generators incorrectly using power 
- Shield generators now correctly use power according to actual field strength.
- Minimal shield dissipation rate now corresponds with 1 renwick field (changed from 10, which technically caused shields to always use max upkeep power ignoring field strength completely)
 2014-11-18 07:34:56 +01:00
DJSnapshot
b078365f66 vote powers r 4 admons only 2014-11-17 15:18:22 -08:00
DJSnapshot
9d5ba587ac Mentors don't need faxes, communications, or prayers. 2014-11-17 15:08:36 -08:00
Chinsky
ff665a2cb3 Merge pull request #7039 from Amunak/beaker-fix 
Beaker fix
 2014-11-18 01:58:56 +03:00
DJSnapshot
8c5639c720 sanity checks and other cleanliness things. 2014-11-17 14:35:24 -08:00
mwerezak
438b750062 Fixes being able to hear people through space when the speaker is inside a pressurized room. 
Moves the pressure check to the hearer's side.
 2014-11-17 16:47:28 -05:00
RavingManiac
594ac35ce1 Fix for dual-vent-pumps being broken. 2014-11-17 21:33:02 +08:00
PsiOmega
df63c63a41 Fixes #7040. 
Pipes should now only be considered overlapping if they share connection types.
 2014-11-17 12:27:29 +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
DJSnapshot
9c0ee5ad8a speshul snoflake color for anyone with +everything in their admin_rank because it was requested by headmins. 2014-11-17 02:40:56 -08:00
DJSnapshot
0c84b32847 small sanity check. 2014-11-17 02:28:20 -08:00
DJSnapshot
e212b4170b R_HOST is now a thing. Also allows gives headmins a global note remove. 2014-11-17 02:23:04 -08:00
DJSnapshot
abd3551754 headmin requested updates to adminhelps. Makes players select between three different types of help to narrow down what players are needing help for. That way mentors get only those relating to needing mentor help. 2014-11-17 01:30:21 -08:00
mwerezak
af8da7de03 Adjusts glass sheet construction menu input 2014-11-16 22:30:07 -05:00
mwerezak
3a83a31440 Merge remote-tracking branch 'upstream/dev' into sliceable 
Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm - caused by whitespace :/
 2014-11-16 22:25:50 -05:00
mwerezak
2e222523e1 Fixes inverted slicing check 2014-11-16 22:13:17 -05:00
mwerezak
72c6de26a4 Adjusts damaged stance system 2014-11-16 22:12:20 -05:00
Chinsky
ce3618a200 Merge pull request #6987 from MagmaRam/labcoat 
Reworked labcoat buttoning
 2014-11-17 04:17:16 +03:00
Chinsky
b3e2b20f91 Merge pull request #7023 from GinjaNinja32/borg_latejoin 
Fix cyborg latejoining, allow mid-round joining, add robot cryo equivalent
 2014-11-17 04:15:18 +03:00
MrSnapwalk
3efbebec14 Adds the new spacesuit sprites. Adds a less IMMULSION-BREAKING description for the syndicate spacesuit/helmet. 2014-11-16 19:05:09 -06:00
mwerezak
9eb6dfdef4 Fixes #7026 
Uploads species var from human to carbon mobs.
 2014-11-16 14:43:38 -05:00
Amunak
07b050435f fixes redundant information for a custom beaker description 2014-11-16 20:34:12 +01:00
Amunak
4a845beb7d corrects volume shown in description of beakers 2014-11-16 20:33:25 +01:00
Zuhayr
cfb5710166 Added module damage to breach checks. Attempted to add relaymove/hardsuit interface procs but failed. 2014-11-17 00:12:57 +10:30
PsiOmega
f850b2616d Fixes the light power consumption the new /tg/ style. 2014-11-16 11:13:27 +01:00
PsiOmega
ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC 
Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm
 2014-11-16 10:38:01 +01:00
PsiOmega
743d9be7d3 Merge remote-tracking branch 'upstream/dev' into Service 2014-11-16 10:34:42 +01:00
MagmaRam
4c5ae21aab Fixed typo that broke everything 
Haste makes waste and breaks everything. At least this time it was less
broken than last time.
 2014-11-16 03:31:22 -05:00
MagmaRam
d01e14eb58 Revert "Revert "Changed defining of icon_open and icon_closed as requested"" 
This reverts commit 046c92419e.
 2014-11-16 03:24:39 -05:00
MagmaRam
046c92419e Revert "Changed defining of icon_open and icon_closed as requested" 
This reverts commit 8d34ffe397.
 2014-11-16 03:24:33 -05:00
MagmaRam
cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat 
Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
 2014-11-16 02:56:32 -05:00
Zuhayr
17670a5698 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spaceninjas 2014-11-16 18:18:46 +10:30
Zuhayr
b9a52a6c35 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-16 18:17:31 +10:30