cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 01:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,954 Commits 8 Branches 0 Tags
8d868fb89082cd78d3473eb2875e55fef5478efd
Commit Graph

22783 Commits

Author SHA1 Message Date
Hawk_v3
8d868fb890 Merge branch 'map' into RadiantMaster 2019-04-14 18:27:05 +01:00
RadiantFlash7
025c358c84 Merge remote-tracking branch 'Repede/master' 2019-04-12 19:54:17 -04:00
RadiantFlash7
fd32189505 Major Map overhaul 
Cargo finalized
Security rework #5 Done.
Maintence fleshed out,
...Security reword #6 started,
Escape hall added in progress,
added centcom z level for transit arrival/departure shuttles along with centcom.
Copied tether.dm files over to /yw map folder for proper custom map compiling. (required for planets to function)
Recoded Planetary atmos to use O2, Super cold O2, and weather to be harsher.
Added a buncha areas to differant mapping z levels, still a lot more to go.
New titlescreen for our server by an artist.
 2019-04-12 19:11:48 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Novacat
0ca3f6e216 Merge pull request #4936 from Heroman3003/walking-rewalking 
Fixes swapping/stepping mechanics ignoring the basic passability
 2019-04-07 15:50:08 -04:00
Novacat
4adac33a2f Merge pull request #4935 from Heroman3003/how-long-have-i-been-asleep-doc 
Fixes disconnect timer message
 2019-04-07 15:49:36 -04:00
Heroman
12183c890f Fixes swapping/stepping mechanics ignoring the basic passability 2019-04-08 04:48:48 +10:00
Heroman
0c69b1b650 Fixes disconnect timer message 2019-04-08 04:13:32 +10:00
Novacat
13b952ee63 Merge pull request #4932 from Heroman3003/fix-assortment 
Assortment of fixes
 2019-04-07 00:19:26 -04:00
Heroman
5a9e1f1566 Ports some fixes 2019-04-07 14:02:34 +10:00
Heroman
44780295c9 Fixes tiny fans blocking people and not blocking atmos 2019-04-07 11:14:31 +10:00
Novacat
4d2bff5b5c Merge pull request #4926 from saysage/master 
Adds colorable moth wings
 2019-04-06 18:35:48 -04:00
Novacat
feca2decc0 Merge pull request #4927 from Heroman3003/hud-icon-testing 
Fixes hud-zshadow bug
 2019-04-06 18:30:37 -04:00
Heroman
98269cf3c6 Fixes hud-zshadow bug 2019-04-07 07:52:19 +10:00
saysage
9c47a9c986 Add files via upload 2019-04-07 00:15:20 +03:00
Novacat
f73a757152 Merge pull request #4924 from VOREStation/upstream-merge-6025 
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
 2019-04-06 14:56:27 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Novacat
2be62bd672 Merge pull request #4922 from Novacat/nova-survival 
Post-release Bugfixing
 2019-04-06 13:50:00 -04:00
Unknown
4420f0cb81 Fixes Resh's Navy blue HoS Jacket 2019-04-06 13:36:39 -04:00
Unknown
128229c12e Ports kick fix early 2019-04-06 12:22:51 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Heroman
ed81342981 Also fixes the mobs attacking non-mob stuff 2019-04-06 17:35:47 +10:00
Unknown
f7406e3d12 Post-release Bugfixing 
- Teshari can now wear hardsuits again
- Virgo 3B Weather now applies to the Plains Expedition Area
 2019-04-06 02:41:12 -04:00
Heroman
0d3e9383b3 Fixes some shadekin bugs 2019-04-06 16:25:56 +10:00
Unknown
34d695c301 Disables rosettes temporarily 2019-04-05 20:48:12 -04:00
Unknown
8b7ae56e83 Last Minute Fixes 
- Fixes Virgo species being able to wear hardsuits.
- Adds new rosette markings and sprites
- Adds new status display icon for code yellow
 2019-04-05 20:08:06 -04:00
Novacat
7047fd7195 Merge pull request #4911 from Novacat/nova-survival 
Lynx Fixes Runtimes Pt 2
 2019-04-05 17:19:28 -04:00
Novacat
d7c7c073a5 Merge pull request #4868 from Novacat/nova-weapons 
Adds liquidprotein rations
 2019-04-05 17:17:53 -04:00
Spades
688e5184cb Merge pull request #4910 from Heroman3003/reverting-it-all-not-really 
Un-kevinzes nanoui and chemistry subsystems back into processes for greater good
 2019-04-05 16:33:29 -04:00
Neerti
a30e229316 Fixes ghosts being counted as contributors for cataloguers. (#6032) 2019-04-05 15:08:10 -04:00
Unknown
cfe9682a34 Lynx Fixes Runtimes Pt 2 2019-04-05 00:11:04 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Novacat
07bc5814b2 Merge pull request #4903 from Heroman3003/research-re-do 
Moves Anomaly Lab to research outpost, replaces with Chemistry set
 2019-04-04 20:52:01 -04:00
Screemonster
629318de74 Refactors regeneration of ravenous races 2019-04-04 06:46:25 +01:00
Heroman3003
80c759ca1c Finishing touches 2019-04-04 10:35:39 +10:00
Spades
3a06becdf3 Merge pull request #4879 from Novacat/nova-ert 
Adds Mlems to Default Species
 2019-04-03 20:29:22 -04:00
Unknown
6d3be92c8d Removes frost oil from pizza 
Fixes #4846
 2019-04-03 15:11:06 -04:00
Unknown
a6732daecc Fixes egg implants 2019-04-03 15:11:06 -04:00
Unknown
a475400b92 Adds Tentaclehead/mouth sprites 
...This was easy to fix? I wonder why the author never fixed it...
 2019-04-03 15:11:06 -04:00
Unknown
a45ddb17f6 Adds tie hair verb to Xenochimera 2019-04-03 15:11:06 -04:00
Layla Crosse/Occula Drenn
73cbcfb1e5 Adds Dragonfly wings and a Chameleon tail. 2019-04-02 23:38:03 -04:00
Novacat
9c71233738 Merge pull request #4899 from Heroman3003/fixing-the-swapparoo 
Fixes passive and mostly passive mobs blocking the way all the time
 2019-04-02 12:19:02 -04:00
Neerti
868d0dd190 Merge pull request #6029 from InterroLouis/master 
Fixes Voidsuit Typo
 2019-04-02 07:57:28 -04:00
Heroman
9b56460487 Fixes a typo 2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9 Fixes passive and mostly passive mobs blocking the way all the time 2019-04-02 09:27:24 +10:00
Novacat
392ae0e127 Merge pull request #4898 from Heroman3003/flavorful-typo-fix 
Fixes a misnaming on Contamination Flavor selection menu
 2019-03-31 23:08:45 -04:00
Heroman3003
a6cfb63856 slightly adjusts a wording on selection of contamination flavor 2019-04-01 12:39:08 +10:00
Novacat
c1b091978d Merge pull request #4893 from Heroman3003/stepping-fixes 
Adds proper exiting to step-code for non-human mobs on non-help intent
 2019-03-31 19:28:12 -04:00
mistyLuminescence
5dc4686ad9 Unidentified Auto Tweak 2: Electric Boogaloo (#5990) 
* Remakes #5983 by request.
 2019-03-31 19:19:59 -04:00
Heroman
704e489bdb Adds proper exiting to step-code for non-human mobs on non-help intent 2019-04-01 07:01:38 +10:00