cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-11 18:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,902 Commits 7 Branches 0 Tags
3ac593922ca759756aeef98ef7db9bbfca0e30cd
Commit Graph

24629 Commits

Author SHA1 Message Date
RadiantFlash7
3ac593922c Update code/modules/research/designs/engineering.dm 
Tagging

Co-Authored-By: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com>
 2020-02-08 22:51:25 -05:00
Repede
faa274f6a2 Merge branch 'master' into master 2020-02-08 11:17:14 -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
SplinterGP
f1e2bc6fd9 Fixes //ywedit on the lists 
title
 2020-02-07 21:11:14 -03:00
SplinterGP
1452ac0749 adds YW edits and lists them on suit cycler correctly 
Title
 2020-02-07 20:41:01 -03:00
Izac Joof Forsgren
8fadaaa6bb Merge branch 'master' into Blinkyfuckingplonkygetthefuckoffmyproperty 2020-02-07 20:56:37 +01:00
Luke Vale
c1d9f70f58 Adds ears_yw.dmi and adds a new set of horns for the ears. Massive horns. 2020-02-07 13:09:51 -06:00
Repede
3cf3cf82e3 Merge branch 'master' into master 2020-02-07 13:21:51 -05:00
lukevale
03edbd2fc3 Update sprite_accessories_taur_yw.dm 2020-02-07 10:41:03 -06:00
Luke Vale
4767a51cce Adds taails 2020-02-07 10:15:24 -06:00
Repede
1cd516a2a9 Merge branch 'master' into master 2020-02-07 10:10:31 -05:00
Repede
6176508072 Merge branch 'master' into YWiconadd 2020-02-06 21:50:09 -05:00
Repede
8373f6ee8d Merge branch 'master' into master 2020-02-06 21:40:01 -05:00
SplinterGP
2d335cd43a Fixes Yawn wider taur sprite not showing 
Adds the YW taur sprites correct icon path as they used the taur_vr instead of taur_yw that is the correct one
 2020-02-06 23:23:29 -03:00
SplinterGP
7c0796668d Adds grey, sprites for items, (jumpsuit etc.) for them, add them to rigsuit list, and also adds their language that they use and telepathy 2020-02-05 19:43:55 -03:00
Killian
7d0bed5e4f add new clothes 2020-02-05 21:50:32 +00:00
Shadow
ca7fd68c99 Fluffi Item 2020-02-02 15:16:31 -06:00
Hawk-v3
3c61ff02f6 Merge branch 'master' into master 2020-02-01 11:37:47 +00:00
Hawk_v3
2f540e0e57 Merge remote-tracking branch 'upstream/master' 2020-02-01 10:36:26 +00:00
Cerebulon
e0258e1449 Fixes antibiotic resistance being reset when copied to new datum instance (#6654) 2020-01-31 23:46:54 -05:00
izac112
a792f018ee . 2020-02-01 01:23:29 +01:00
izac112
52b41f0019 Might look better 
Signed-off-by: izac112 <izac10@live.com>
 2020-02-01 01:22:50 +01:00
izac112
684b737dd0 Re-Adds prom water damage 2020-02-01 01:11:13 +01:00
Repede
2be5ceca85 Fixes service borg having plasteel for some reason / compile fix 2020-01-31 17:44:15 -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
Atermonera
1bc3ccf858 Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no 
Hacky Fix for Athletic Shorts showing Missing Icon
 2020-01-30 19:24:59 -05:00
Novacat
7a9f31a26a Merge pull request #6515 from TheFurryFeline/patch-18 
Redundant Warning Removed
 2020-01-30 02:09:59 -05:00
TheFurryFeline
301cae5994 Redundant Warning Removed 
Changelog Notes: 

- Removes the big, honking red text about archive being slated for removal. We're not removing entries from the database.
 2020-01-29 12:28:28 -05:00
Atermonera
16989eaa84 Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix 
Fixes constant stacking machine runtimes
 2020-01-28 14:14:06 -05:00
Novacat
75b8b621f9 Merge pull request #6490 from Rykka-Stormheart/shep-dev-borghound-buffs 
Add additional tools for Research Hound and Pupdozer - Upstream Port
 2020-01-26 16:38:37 -05:00
Novacat
f522a88378 Merge pull request #6489 from Rykka-Stormheart/shep-dev-pupdozer-model 
Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port
 2020-01-26 16:38:25 -05:00
Novacat
4505684fbd Merge pull request #6507 from VOREStation/upstream-merge-6603 
[MIRROR] Add an audible alarm sound to SM Delamination
 2020-01-25 23:04:14 -05:00
Novacat
c44268a96d Merge pull request #6506 from VOREStation/upstream-merge-6649 
[MIRROR] Fixes Bagel Poppy Recipe
 2020-01-25 22:56:34 -05:00
Novacat
2366e865f3 Update supermatter.dm 2020-01-25 22:56:18 -05:00
Atermonera
d5869f2c3f Add an audible alarm sound to SM Delamination 2020-01-25 22:25:49 -05:00
Atermonera
4e523c9b5e Merge pull request #6649 from Trexdude/patch-1 
Fixes Bagel Poppy Recipe
 2020-01-25 22:16:18 -05:00
Atermonera
560a24ee83 Merge pull request #6637 from Mechoid/AugmentsRespectBeds 
Augments Respect Beds, Robotic
 2020-01-25 22:14:02 -05:00
Repede
44819df15f Merge branch 'master' into Bluecoffe-Runtime 2020-01-25 21:40:52 -05:00
Shadow
1c5c211734 Aaaaa 2020-01-25 20:17:32 -06:00
Shadow
7e831fc9f1 Covfefe 2020-01-25 20:09:13 -06:00
RadiantFlash7
e80b079088 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-01-25 01:29:25 -05:00
RadiantFlash7
8704ce4f39 Typo fixes 
Typofixes in event anouncements.
 2020-01-25 01:29:13 -05:00
RadiantFlash7
bfef971ffd Merge branch 'master' into master 2020-01-25 01:25:45 -05:00
RadiantFlash7
c2ea5fd750 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-01-25 01:23:25 -05:00
RadiantFlash7
2931d08ffe Medbay Re-work, gunless vendors 
Moves Ballestics guns from vendors to equipment area in front of armoury (Still for officer's use.)
Reworks like. Most of medbay. (I pulled my hair out for you hawk. Love me ;-;)
Most important feature: Emotional support Corgi named Mister Wiggles.
 2020-01-25 01:23:16 -05:00
TheFurryFeline
0b10c316cc Aaa 
Typo fix to comment, ree.
 2020-01-24 11:17:30 -05:00
TheFurryFeline
41ce1ae13f No More Vines That Shrink Thee 
Changelog Notes: 

- Blacklist Macro/micro/normal cillins from list of spawnable chems in vines that can get injected into your body. This is purely for pref reasons if you don't actually like having your size changed.
 2020-01-24 10:26:11 -05:00
Novacat
4d2ec30fb9 Merge pull request #6499 from VOREStation/upstream-merge-6645 
[MIRROR] Adds book cart to library
 2020-01-24 00:55:57 -05:00
Novacat
44bad05eed Merge pull request #6501 from VOREStation/upstream-merge-6639 
[MIRROR] Preset (mapped-in) modular computers now have printers by default.
 2020-01-24 00:54:22 -05:00