cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,965 Commits 5 Branches 0 Tags
05922375c57b33ea70ba535c2237c6c3f11c7627
Commit Graph

9161 Commits

Author SHA1 Message Date
Zuhayr
05922375c5 Added the remaining missing icons (shitty codersprites, pls fix spriters) 2014-11-22 07:57:34 +10:30
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
PsiOmega
2a796f2ddd Merge remote-tracking branch 'upstream/master' into dev 2014-11-21 10:27:56 +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
PsiOmegaDelta
e3ef3b7347 Merge pull request #7081 from MagmaRam/bugfix 
Fixes paper bundles not burning properly with a match
 2014-11-21 08:02:13 +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
mwerezak
8a975fec06 Removes interdepartment fax cooldown 2014-11-20 14:36:05 -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
PsiOmegaDelta
1e6028b49e Merge pull request #7055 from atlantiscze/dem-shields 
Fixes renwick shield generators incorrectly using power
 2014-11-20 15:11:33 +01:00
Atlantiscze
b6c7454f52 Fixes possible runtime when sensor is destroyed while open in computer. 2014-11-20 14:45:12 +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
Atlantiscze
cd187ae046 Nicer monitor GUI 
- Instead of showing all sensor readings in one ugly ultra-long screen, selection menu for sensors is used.
 2014-11-20 14:21:55 +01:00
Chinsky
3f80ee89d2 Merge pull request #6889 from PsiOmegaDelta/APC 
BYOND akbar
 2014-11-20 14:51:30 +03:00
MagmaRam
587f29e5d3 Fixes paper bundles burning strangely with a match and burning one paper at a time, leaving a lone paperclip at the end that would eat any paper added to it and never let that paper be interacted with. Paper bundles now burn the same way (whole thing at once) no matter what you're burning it with, rather than only burning that way with a lighter. 2014-11-20 05:08:38 -05:00
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01:00
MagmaRam
72b0000f6a Fixes a bug where core samplers dispensed bags that you could not take rock slivers out of. 2014-11-20 00:41:43 -05:00
MagmaRam
0eed2c2fa6 Fixes the xenoarch eguns. 
This was done by making the xenoarch eguns new subtypes with different update_icon() procs than the regular eguns. The new subtypes are in finds_eguns.dm
 2014-11-19 22:42:58 -05:00
MagmaRam
77c883cc6d Fixes missing icons for xenoarchaeology items EXCEPT for the energy guns. 2014-11-19 21:35:34 -05:00
MrSnapwalk
07441e1e61 Attempting to fix conflicts with the following files: 
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
 2014-11-19 13:54:28 -06:00
Segrain
bec483aa1b Alphabetical sorting. 2014-11-19 19:05:06 +03:00
Segrain
c4d95c39f1 Folders, fixes. 2014-11-19 18:42:34 +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
Zuhayr
ffc37dc151 Compile fix. 2014-11-20 00:41:45 +10:30
Zuhayr
b083cdf266 Additional interface work. 2014-11-20 00:31:12 +10:30
Zuhayr
b6ee53a4c3 Added integrated AI hardsuit interface verb, tweaked Topic() a bit so the AI can use it. 2014-11-20 00:22:07 +10:30
PsiOmega
c45f77f247 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-19 14:40:18 +01: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
41f372e532 Merge pull request #7056 from PsiOmegaDelta/laws 
Multiple Law Statements
 2014-11-19 23:16:35 +10:30
Zuhayr
0f6811608e Merge pull request #7054 from mwerezak/cat 
Fixes simple_animal emotes, implements custom item for for Foxler
 2014-11-19 23:15:39 +10:30
Zuhayr
e81b94fa92 Merge pull request #7050 from PsiOmegaDelta/Pipes 
Fixes #7040
 2014-11-19 23:13:46 +10:30
Zuhayr
425aaf1cba Merge pull request #7047 from mwerezak/sliceable 
Fixes inverted slicing check
 2014-11-19 23:13:16 +10:30
Zuhayr
1dd02be27d Merge pull request #7046 from mwerezak/stance 
Adjusts damaged stance system
 2014-11-19 23:12:43 +10:30
Zuhayr
25dde76639 Merge pull request #7045 from mwerezak/no-sound-in-space 
Fixes being able to hear people through a vacuum
 2014-11-19 23:12:11 +10:30
Zuhayr
0f0bca6889 Merge pull request #7038 from mwerezak/diona-scream 
Fixes #7026
 2014-11-19 23:11:50 +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
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
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
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