cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-06 22:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,111 Commits 10 Branches 0 Tags
b90f7ec922fab98166ddb6471619ef181894de38
Commit Graph

2619 Commits

Author SHA1 Message Date
Aronai Sieyes
db04d43f2c Made the new chairs steelsheet constructable 2020-02-29 13:02:43 -05:00
Aronai Sieyes
0d7b1d7240 Fix bug with setting icon for breather 2020-02-29 12:00:48 -05:00
Aronai Sieyes
e5b9cb57de Add additional chairs 2020-02-29 11:46:11 -05:00
Atermonera
695ea645fe Merge pull request #6740 from Heroman3003/orangeyellow 
Adds orange and yellow cloth materials
 2020-02-26 20:26:40 -05:00
Novacat
650007f9e7 Merge pull request #6672 from VOREStation/upstream-merge-6729 
[MIRROR] Fix and tweak station Railguns.
 2020-02-24 20:26:32 -05:00
Atermonera
55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo 
Fix and tweak station Railguns.
 2020-02-24 16:15:04 -05:00
Atermonera
b26daf5fb1 Hide items in plant pots and plushies 2020-02-24 16:01:08 -05:00
Heroman
726664f6f0 Makes all sofa colors/subtypes makeable 2020-02-24 18:19:56 +10:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
0cb233514a Replace IV Drips with medical stands 2020-02-22 00:51:49 -05:00
Aronai Sieyes
5a75891c77 Salvageable machines 2020-02-21 16:54:41 -05:00
Aronai Sieyes
11edb0febe New rollerbed sprites 
Less eye-melting blue
 2020-02-21 11:34:09 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js 
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
 2020-02-19 19:55:01 -05:00
Nadyr
8fd3b260da Merge pull request #218 from Shadowfire117/Casinoport 
Casino port!
 2020-02-17 22:59:14 -05:00
Unknown
a5f3776a91 adds _vr to trash pile 2020-02-17 00:01:50 -05:00
Unknown
b5f337a3b0 Replaces Tramadol maint pills with Paracetamol 2020-02-16 10:54:55 -05:00
TheFurryFeline
5859b28dbe I Got No Wood 
Changelog Notes:

- Prevents wood generation exploit for the holodeck that lets you get wood from holodeck generated dead/pine trees.

- Thus adding holodeck variation.
 2020-02-15 22:40:47 -05:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Razgriz
555cc64454 Merge pull request #225 from D-H-A/master 
Stair Decals and a Boxing Ring
 2020-02-12 15:39:39 -07:00
DHA
4adfbb57f4 Boxing Ring files & Icons 
Currently uses procs from window.dm. Might change in the future.
 2020-02-12 06:41:04 -08:00
Novacat
22c0fd363f Update bed.dm 2020-02-08 15:56:26 -05:00
Meghan-Rossi
3935aa3e47 fix conflict causing compile error 2020-02-08 19:32:03 +00:00
Atermonera
c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
RadiantFlash7
fc1015a0a6 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-02-07 19:57:01 -05:00
RadiantFlash7
b5142f5077 RPD Changes 
Map fixes and changes!
Adds RPD to science,
Removes RPD from locker, leaves one on table in atmosia.
Removes APC for cryogaia compound. should be able to make new buildings/rooms now.
 2020-02-07 19:56:57 -05:00
Shadowfire
57464baadc port 0.9.9.9 
just uploading so others can see work, still not ready for commitment
 2020-02-08 01:11:36 +01:00
Killian
7d0bed5e4f add new clothes 2020-02-05 21:50:32 +00:00
Atermonera
80ec8ac200 Merge pull request #6656 from Amunak/countable-lists 
Prettifies closet contents list with (newly added) countable variant of english_list
 2020-02-01 18:01:23 -05: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
lbnesquik
7970a9516a Forgot a to_chat( edit. 2020-01-22 08:52:17 +01:00
lbnesquik
b93e2c2a96 Add chomp pointers & correct typos 2020-01-22 08:49:46 +01:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
lbnesquik
83eeb5f5d7 Add an Examine to Bonfires 2020-01-19 16:01:28 +01:00
Unknown
d3aa3bed3c Removes gnomes 
https://cdn.discordapp.com/attachments/173832207784214528/666485419747180554/7f1b99fdd795299aabd6ddef202ecf98.png

This is why we cannot have nice things.
 2020-01-13 22:49:15 -05: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
4c18d156cd Actual fix. 
Commas MUST go on the end of comments in the middle of a list. The fail is normally the line ABOVE the one Travis reports.
 2020-01-13 19:06:19 +00:00
Hawk_v3
f36bda0ffd Or is this the list fix? I can't read AWK and regex. 
I know where the file IS, just...
 2020-01-13 19:01:15 +00:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Novacat
c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER 
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
 2020-01-12 22:14:17 -05:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure 
You've been gnomed.
 2020-01-12 22:02:41 -05:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Holdelta
9c7e1f82af Fixing Travis formatting part 2 
Adding a parenthesis at the end of a comment because Travis.
 2020-01-12 15:44:47 -08:00
Hawk_v3
697641a913 Indentation Fix 
Travis checks for proper closure. While this might not actually fix it, it's expecting to see ) at the end of the line, as I've run into this one before.
 2020-01-12 23:30:34 +00:00
Heroman
06b5064a8e Makes drone pods remain active after first attempt, allowing a ghost to click on it to enter 2020-01-13 07:21:48 +10:00
Holdelta
a306d5fd4e Update engineering.dm 2020-01-11 23:34:21 -08:00