cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 9 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

3924 Commits

Author SHA1 Message Date
lbnesquik
e0fcf47373 Add a craftable, two-handed sledgehammer. 
- Can be made out of plasteel, rods and metal.
- Relatively high damage but less than the fireaxe.
- Special sound.
 2020-01-21 13:48:28 +01:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +00:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Holdelta
7253e569a2 Add files via upload 2020-01-11 23:43:25 -08:00
Ketrai
7d7ce8b716 Moves files to a ch file 2020-01-11 20:36:53 +01:00
Ketrai
e1ade7153b Refactors cake 2020-01-11 17:36:57 +01:00
Razgriz
eae4759de1 Standards conformation 2020-01-11 03:51:35 -07:00
drexample
747114793c WE ALWAYS DELIVER! 2020-01-11 05:28:00 +03:00
Sharkmare
f568be89d9 The cake, Serg event. (#120) 
Adds items for an event, Made by Shadowfire117 and Ketrai
 2020-01-11 00:20:57 +01:00
Novacat
4f6a7972d6 Merge pull request #6404 from Ketrai/iwantdie 
adds food cubes.
 2020-01-09 22:51:32 -05:00
Novacat
09e10e2901 Merge pull request #6406 from VOREStation/upstream-merge-6592 
[MIRROR] Xenoflora expansion take2
 2020-01-08 17:18:49 -05:00
Ketrai
85667c2a9b adds gnomes. (#6595) 
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
 2020-01-08 13:47:41 -05:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Ketrai
9112a9a2b6 Food cubes 
woop


removes a line of unneeded code
 2020-01-07 22:51:12 +01:00
Hawk_v3
717207490a Merge remote-tracking branch 'server/master' 2020-01-06 00:00:30 +00:00
RadiantFlash7
e26b48d335 Map fixes. 
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
 2020-01-05 01:09:08 -05:00
Kazzc
9d8084f4eb Ported in some food items from our old code. 
created three files: food_cm, recipes_microwave_cm & snacks_cm
Added food sprites for: tocino, pandenata, garlicbread, bigos, tamales & sauerkraut.
programmed food items for: tocino, pandenata, garlicbread, bigos, tamales & sauerkraut.
 2020-01-02 06:32:38 -06:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
lbnesquik
2129ac25d0 Remplaced my apparently buggy weapons file with the one from git 2019-12-30 09:17:16 +01:00
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01:00
Hawk_v3
70711c03e1 Merge remote-tracking branch 'upstream/master' 2019-12-29 20:34:58 +00:00
Novacat
f2fb0d9f6a Merge pull request #6360 from Ketrai/sharksbranch 
Adds a new fish, measelsharks!
 2019-12-29 15:11:46 -05:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea Introduce more taur clothes. 
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
 2019-12-25 20:40:21 +01:00
Razgriz
d80bd487e2 Add files via upload 2019-12-23 00:38:30 -07:00
Razgriz
5782d3b1ea Add files via upload 2019-12-23 00:07:49 -07:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Ketrai
0e65a0b8a6 Adds sharks 2019-12-22 17:32:49 +01:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Schnayy
29e187bb83 Adds 10 new clothes + sprite fixes. (#6575) 2019-12-20 00:44:28 -05:00
Razgriz
f56a524a5a Power.dmi 2019-12-19 01:13:26 -07:00
RadiantFlash7
0d40994226 Fixes galore & New away mission 
Beach Away mission is Now Whiskey Station Mission.

Fixes a large number of bugs from github (Help me pls)
 2019-12-16 23:12:56 -05:00
Razgriz
979bd4891c Map, Icons, and DME 
Southern Cross, old CHOMPStation stuff, and DME for the southern cross.
 2019-12-16 18:58:59 -07:00
RadiantFlash7
99acb57b34 Bugfixes galore, New beach away, file shrink to 250x250 
Completely revamps the beach mission. No more 'safe' missions for our intrepid explorers.

Fixes a metric ton of bugs that I actually lost count. My head hurts.
Several varients of mobs have event types added to prevent them from wandering, for the away missions.

Also Shrinks files down to 250x250.
 2019-12-16 01:56:56 -05:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
RadiantFlash7
3fc8f433bc Play Test fixes 
Fixes every single bug in the playtest so far.
 2019-12-08 11:33:54 -05:00
Unknown
f42cd78de3 Fixes Elven Weapons 2019-12-06 19:14:35 -05:00
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder 
Centcom/Tether Ship Changes
 2019-12-06 16:06:56 -05:00
listerla
086cfb579c Adds Irrlicht's 'soft' shroud (#6545) 
* Adds Irrlicht's soft Shroud

* fixes
 2019-12-05 18:28:53 -05:00
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
 2019-11-29 19:13:53 -05:00
Unknown
aa25f5ebbd More Updates 2019-11-27 15:50:54 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
RadiantFlash7
2aac0c0171 Map Overhaul+instruments 
new instruments added, Changed snowoverlay to snow floor decal,
Exploration ship jump submap done.
Plains finished, Just needs teleporters setup.
Tons of improvements to hallways.
Floor colors!
Remade engineering (again)
Disposals finalized,
 2019-11-23 22:06:21 -05:00
Hawk_v3
bafec81a0a Merge Upstream 2019-11-22 23:40:13 +00:00
Atermonera
ec3167e4ce Merge pull request #6525 from TheFurryFeline/TFF-Let_The_Plushies_Live! 
Mouse Plushie Sprite Change
 2019-11-19 14:28:32 -05:00
Repede
d97f049b1c Adds Strix Hades plushie as a selection, ingame plush. 2019-11-17 21:20:27 -05:00