cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 7 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

3137 Commits

Author SHA1 Message Date
PsiOmega
52e6f96dc7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-09 17:55:14 +01:00
Ccomp5950
cab064cd16 Merge pull request #7340 from Zuhayr/dev-freeze 
Dev-freeze fixes.
 2014-12-09 11:48:33 -05:00
Zuhayr
7bc72fb836 Tidied up/fixed up the rig back icons. 2014-12-09 21:01:17 +10:30
Zuhayr
ff2c23714f Bunch of diona nymph tweaks/fixes. 2014-12-09 20:52:41 +10:30
Loganbacca
9fce8921ac Tape fixes 
- All paper variants now have taped icon states (might change this to an overlay in future)
- Tape objects inherit overlays from attached papers
 2014-12-09 22:53:49 +13:00
PsiOmega
48aeefa85a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm
 2014-12-09 09:42:14 +01:00
Raptor1628
921249a335 Hardsuit Fixes 
Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
 2014-12-08 19:12:39 -05:00
PsiOmega
445dba869d Merge branch 'dev-freeze' into dev 2014-12-08 17:38:13 +01:00
Zuhayr
371bdb10d9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-08 13:03:20 +10:30
Raptor1628
75659ab66a Hardsuit Mark Two, more Hulabaloo 
Adds all sprites for the nukeop and research hardsuit. Shuffles around
hardsuit spawns and gear so they make sense, especially for the ERT,
they still only have two hardsuits per department, but there are enough
magboots and vests for the people who need the regular armor. Added the
medical hardsuit and its attendant gear to the station hardsuit list.
Added all of the xenoarch gear to the hazmat hardsuit for Zuh. Moves
some suit storage things around as they were lost somewhere along the
way since I committed them. Moves the Hazard Suit custom item over to
hardsuit code to prep for them being buildable on station at some point.
For now has the same stats as a voidsuit, no modules, just drains power
and has some extra pretty sprites. Sending this over to dev freeze
because most of it is required for hardsuits to be nice and pretty for
master. Now compatible with latest fixes.
 2014-12-07 21:25:08 -05:00
Zuhayr
a7ce13f49d Fixes #7223 and #6966, adds inhand and suit sprites for nymphs. 2014-12-07 20:44:11 +10:30
MrSnapwalk
c6fae30b1c Updates Matthew951's custom borg sprite to the latest version. 2014-12-06 16:56:07 -06:00
mwerezak
5b1f7695e3 Remaps the nuke ops shuttle for station docking 
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
 2014-12-05 01:17:17 -05:00
PsiOmega
c7021cea13 Custom Sprites 
Adds Star Light and I-96, see http://baystation12.net/forums/viewtopic.php?f=33&t=11701 and http://baystation12.net/forums/viewtopic.php?f=33&t=11702 respectively.
 2014-12-03 20:48:00 +01:00
Loganbacca
76d87e7c84 Tape fixes 
- Shrunk tape roll sprite
- Disabled tearing off individual strips of tape until they have a use
- Fixed a runtime when removing tape with nothing stuck to it
 2014-12-02 23:45:33 +13:00
Loganbacca
224b2f3899 Duct Tape 
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
 2014-12-02 23:17:45 +13:00
PsiOmegaDelta
e18d5f51f9 Merge pull request #7172 from Neerti/11_29_14_minor_borg_drone_changes 
Minor changes to drone borg sprite.
 2014-12-01 06:46:46 +01:00
Chinsky
7d630f952f Merge pull request #7155 from PsiOmegaDelta/XenoHUD 
Xenobiology SecHUD icon
 2014-11-30 12:50:54 +03:00
MrSnapwalk
c88042ae4b Adds Atlantiscze's custom borg and AI sprites. 2014-11-29 14:47:43 -06:00
Neerti
9cf2b467b9 Fixes the 'drone' sprite for borgs. The eyes are now actual eye sprites instead of attached to the base sprite. No more pumping 40 shots into a secborg and wondering why it won't die. 
Adds option for medical module to use the medical drone sprite.
Adds sprite for surgery and mining.  Mining will no longer use a medical sprite (why???)
 2014-11-29 14:49:08 -05:00
Amunak
7512246c8b Added toggleable 'chat tags' that can mark different channels in chat. 
They are toggleable in the player preferences verb-tab, default is on. They are not necessarily limited to anything, it is just an image in text. The main use is to mark some distinct channels (like OOC, LOOC, admin and mod cheat, dead chat, PMs, ...). To make them more visible, easily distinguishable and perhaps more visually appealing.
 2014-11-28 11:15:22 +01:00
PsiOmega
733ed741fa Xenobiology SecHUD icon 
Made by Malsquando, see http://baystation12.net/forums/viewtopic.php?f=44&t=4294&start=660#p248937.
 2014-11-27 11:55:41 +01:00
Neerti
ff5acd7e8f Adds my approved custom ai core sprite. I think I did it right. 2014-11-25 15:02:37 -05:00
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
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
PsiOmega
f3173bbbcf Merge remote-tracking branch 'upstream/dev' into Science! 2014-11-22 11:37:17 +01:00
PsiOmegaDelta
51386b6b45 Merge pull request #7102 from PsiOmegaDelta/AssignmentERT 
ERT and Xenobiology security HUD icons
 2014-11-22 11:18:09 +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
3ca02037ef Merge pull request #7088 from mwerezak/skrell 
Implements skrell changes for Searif
 2014-11-22 03:23:41 -05:00
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
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
MagmaRam
ee4ea4977c Adds inhand sprites for the captain's tunic and jacket 2014-11-21 08:14:57 -05:00
Neerti
72c9b2eb15 Resolves conflicts, cherrypicks my code. 2014-11-21 03:32:00 -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
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
PsiOmega
714a14776f Research Isolation Cells 
The research cells are now even more isolated.
 2014-11-20 16:53:17 +01:00
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01: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
Ccomp5950
088c86f692 Merge pull request #7065 from Zuhayr/combitool 
Added combi-tool.
 2014-11-19 08:37:15 -05:00
Zuhayr
0c6dd7d128 Looks like I accidentally committed some icons at some point. 2014-11-19 23:28:35 +10:30
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +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
mwerezak
4377ada588 Implements custom item for Foxler, fixes simple_animal emotes. 2014-11-18 16:19:59 -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