cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,016 Commits 6 Branches 0 Tags
c8e00f3e20a3dda3a8c04c5d5ec11ac7d6dc9b24
Commit Graph

9192 Commits

Author SHA1 Message Date
PsiOmegaDelta
c8e00f3e20 Merge pull request #7089 from sabiram/dev 
Moves my (sabirm)'s custom item to common loadout pool
 2014-11-23 18:08:16 +01:00
PsiOmegaDelta
8e50a32ba8 Merge pull request #7103 from Segrain/dev 
Robotic appearances.
 2014-11-23 12:05:51 +01:00
PsiOmegaDelta
46a1a7c320 Merge pull request #7101 from MagmaRam/sprites 
Adds inhand sprites for the captain's tunic and jacket
 2014-11-23 12:05:45 +01:00
Zuhayr
f722d570fa Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-23 12:52:55 +10:30
PsiOmegaDelta
6db8680406 Merge pull request #7097 from GinjaNinja32/sensors 
Crew Monitoring Computer improvements, wallets working with computers
 2014-11-22 22:36:40 +01:00
Ccomp5950
674a76645f Merge pull request #7082 from PsiOmegaDelta/Science! 
Further Research Isolation Cell Changes
 2014-11-22 05:39:52 -05:00
PsiOmega
f3173bbbcf Merge remote-tracking branch 'upstream/dev' into Science! 2014-11-22 11:37:17 +01:00
PsiOmega
1784e62621 Merge remote-tracking branch 'upstream/dev' into Stripping 
Conflicts:
	code/modules/mob/living/carbon/human/whisper.dm
 2014-11-22 11:27:19 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas 
Hardsuit/voidsuit change, ninja refactor.
 2014-11-22 09:30:54 +01: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
2b7170a6aa Merge pull request #7091 from mwerezak/gun-intents 
Adds intent-based firing control to guns, fixes targeting bug
 2014-11-22 03:25:12 -05:00
Ccomp5950
3ca02037ef Merge pull request #7088 from mwerezak/skrell 
Implements skrell changes for Searif
 2014-11-22 03:23:41 -05:00
Ccomp5950
efcf9a9d34 Merge pull request #7087 from mwerezak/master 
Fixes #7086
 2014-11-22 03:13:49 -05:00
Zuhayr
1c35f8825b Dummied out the AI movement code for a later project. 2014-11-22 08:04:06 +10:30
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
7182ff9c3f /tg/ input stripping. 
Borrows /tg/ html stripping code.
Ghosts are the first to be given this boon, they now have to deliberately emote things like "Spooky man and it#36&;s friends type crap".
 2014-11-21 18:32:51 +01:00
Segrain
078d6f74a5 Robotic flavour texts. 2014-11-21 19:32:40 +03:00
Segrain
7f199874fb Examining robomodules. 2014-11-21 19:28:46 +03:00
MagmaRam
ee4ea4977c Adds inhand sprites for the captain's tunic and jacket 2014-11-21 08:14:57 -05:00
GinjaNinja32
116705b61b Fixes wallets, makes CMC use alt-titles, actually remove dead block 2014-11-21 10:42:52 +00:00
PsiOmega
2a796f2ddd Merge remote-tracking branch 'upstream/master' into dev 2014-11-21 10:27:56 +01:00
Neerti
0379acad97 Fixes a runtime I made by improper conflict resolution. 2014-11-21 03:47:38 -05: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
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
aaba7e5c74 Adds intent-based firing control to guns 2014-11-20 23:10:47 -05:00
sabiram
bdf4905289 I am dumb 
It is what it is.
 2014-11-20 17:08:24 -05:00
sabiram
f5a196b930 Removes extra breaks 
I am dumb
 2014-11-20 16:26:31 -05:00
sabiram
5d461f4976 Custom item deleted and added to loadout pool 2014-11-20 16:18:35 -05:00
mwerezak
1751caa64f Adds skrell headtail items 2014-11-20 15:51:52 -05: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
mwerezak
d552839c0b Fixes #7068 2014-11-20 14:23:40 -05:00
mwerezak
e6b5d4cf77 Skrell icon/appearance changes 
Adds desaturated skrell body and hair sprites, fixed colour skrell eyes,
and blood colour as requested by Searif.
 2014-11-20 13:10:42 -05:00
Hubblenaut
aeda763e81 MedicalHUD takes hardcrit in account 2014-11-20 18:42:17 +01:00
PsiOmega
714a14776f Research Isolation Cells 
The research cells are now even more isolated.
 2014-11-20 16:53: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