cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-04 13:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,619 Commits 10 Branches 0 Tags
2c8aefb8810d4e837156952fffbce7ea89b34a07
Commit Graph

3301 Commits

Author SHA1 Message Date
Shadowfire
ce1c0ec533 Casino prize dispenser update 
Redoing since github believes theres to be a conflict when in reality there was just changes made to files already been worked on in the casinoupdate branch
 2020-03-13 03:36:47 +01:00
Shadowfire
f6daac300f fixy fix 
Okay, fixed a lot of issues and reacted to the comments to parts of commit, hopefully we will get a nice pretty travis report this time
 2020-03-09 15:31:04 +01:00
Shadowfire
5b0bfcde7a wip casino1 
Made confetti sprite and system
Made a confetti grenade
Made special casino card deck and sprites that doesnt contain joker
made sofa constructible from wood, still needs more work
added new casino card decks to casino map
 2020-03-02 22:30:33 +01:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Razgriz
d7ccdf028a Update stunbaton.dm 2020-02-07 17:42:37 -07:00
Razgriz
127a35b7cf Stun baton: Taking the harm out of disarm 
Ports https://github.com/CHOMPstation/CHOMPstation/pull/632

It's called a HARM baton, not a DI(h)SARM baton.
 2020-02-06 00:19:57 -07:00
Shadow
cac9abeb84 SPACING AAA 2020-01-31 22:03:50 -06:00
Shadow
502393f4dd Disarm to grab 2020-01-31 21:59:31 -06:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Razgriz
9c5a4e3575 Merge pull request #185 from lbnesquik/Sledgehammer-Add 
Add a craftable, two-handed sledgehammer.
 2020-01-24 03:03:02 -07:00
Atermonera
908489b1bd Merge pull request #6640 from TheFurryFeline/patch-5 
Aaaa, typo fixy
 2020-01-21 18:14:22 -05:00
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
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Aaron
ff9ec4943b New Mech "Scarab"! Plus a bunch of mech fixes 
Adds a new mech the "Scarab"! A fast scout mech with terrible armor and health and equipment slots, but it's fast! Ideal for enter a conflict, scouting, maybe taking a pot shot and and then BUGGERING off.
Bug fixes:
-Fixes Polecat armor to plasteel exploit and makes the polecat actually use up the armor.
-Fixes the Serenity eating entire stacks of plasteel and giving gygax armor plates when you try to get it back.
-Fixes the Phoron bore to HOPEFULLY show up in the mechfab in the server.
 2020-01-20 19:51:24 -05:00
Cebutris
3450336020 does the thing, and another thing 2020-01-20 13:44:02 -05:00
Atermonera
7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building 
Can now (de)construct chem masters
 2020-01-15 23:16:19 -05:00
Razgriz
3009bade9e Remove sleeving cure 
Removing resleeving sickness
 2020-01-13 18:49:46 -07: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
6dcf1520b4 Let's get this wrapped up and ready to go. 
Removed all KHI references, and the Vore AI Law stuff.
 2020-01-13 19:38:10 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Holdelta
6b83f6010e Update RPD.dm 2020-01-12 00:35:04 -08:00
Holdelta
971926f195 Add files via upload 2020-01-11 23:29:43 -08: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
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93 Adds a single cure pill to vault, doubles amount ERT gets, changes taste 2020-01-10 09:31:51 +10:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Hawk_v3
838f5e9418 Merge remote-tracking branch 'upstream/master' 2020-01-06 00:47:53 +00:00
Heroman
e05fdf6258 Fixes clamp issues 2020-01-06 08:37:27 +10:00
Heroman
9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01:00
Razgriz
9656b7c18a Notification change for welderbombing 
Instead of saying gaypwnd, it says you are doomed when welderbombing.
 2019-12-29 14:25:49 -07:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Heroman
572112d28b Fixes AI not being able to resist out of nets 2019-12-29 08:33:10 +10:00
Repede
2af9f4ee44 Merge branch 'master' into master 2019-12-26 20:40:10 -05:00
lbnesquik
562df07602 Move the lance sprite to weapons_vr.dmi. 2019-12-26 07:25:49 +01: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
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Shadow
c59e362fb5 Adds Change Tags 2019-12-22 21:14:09 -06:00
Shadow
d4e45ee3b1 Adds the Booze Borg 2019-12-22 20:02:36 -06:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Meghan-Rossi
ef7dfaa6cc Resolve conflicts, fix compile errors 2019-12-19 18:44:47 +00:00
Shadow
0d8ab20599 A Slash! 2019-12-16 16:11:28 -06:00
Atermonera
ef75d1c2a0 Clean up dead code obsoleted by outfit system 2019-12-16 00:51:16 -05:00
Shadow
71b7b93c21 untested™️ 2019-12-15 17:06:43 -06:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00