cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
7368ed007168d8d05260945c1e3ad418c134b43d
CHOMPStation2/code/modules
History
Aroliacue 7368ed0071 [READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
2023-07-31 15:00:03 +02:00
..
admin
[MIRROR] Adds(feature): Triggerable Landmarks for Event-help (#6675)
2023-07-30 08:24:23 +02:00
ai
[MIRROR] Adds means for staff to initialize new mob ai or modify existing ai type (#6676)
2023-07-30 08:23:58 +02:00
alarm
…
artifice
More 515 Compatibility
2023-06-05 21:21:35 +00:00
assembly
More 515 Compatibility
2023-06-05 21:21:35 +00:00
asset_cache
feat: Better changelogs
2023-07-17 18:54:57 +02:00
awaymissions
P90K Revamp
2023-07-12 07:39:22 +10:00
blob
…
blob2
Spell Fixes
2023-06-19 04:40:45 +00:00
busy_space
…
busy_space_vr
Spell Fixes
2023-06-19 04:40:45 +00:00
busy_space_yw
…
casino
Tweaks and tidying
2023-07-03 10:24:10 +00:00
catalogue
fix merge conflicts
2023-06-19 12:32:36 +02:00
client
[MIRROR] Recolourable fingerless gloves (#6674)
2023-07-30 08:18:32 +02:00
clothing
[MIRROR] Recolourable fingerless gloves (#6674)
2023-07-30 08:18:32 +02:00
compass
…
customitems
…
detectivework
…
DMAPI
…
economy
[MIRROR] Simplified Coin Press (#6645)
2023-07-24 10:01:05 +02:00
emotes
Autowhisper
2023-07-17 05:53:13 +00:00
entopics_vr
…
error_handler
…
eventkit
[MIRROR] Modifies "MobSpawner" and Adds ability to set-up mob AI through the interface (#6685)
2023-07-30 17:02:32 +02:00
events
Update spacefish_migration.dm
2023-07-16 13:57:08 -07:00
examine
Spell Fixes
2023-06-19 04:40:45 +00:00
ext_scripts
More 515 Compatibility
2023-06-05 21:21:35 +00:00
fireworks
Merge pull request #14700 from Heroman3003/weather-fixes-changes
2023-03-18 20:56:21 +00:00
fishing
Merge pull request #14912 from Youtubeboy139/Thaler-Change
2023-06-01 20:36:54 +00:00
flufftext
Merge pull request #15099 from Heroman3003/misc-fixes
2023-07-01 23:33:38 +00:00
food
resync upstream file (not used), and add changes to our file
2023-07-11 16:24:37 +02:00
gamemaster
Merge branch 'master' into upstream-merge-14976
2023-06-17 14:47:37 +02:00
games
…
genetics
…
ghosttrap
…
holodeck
…
holomap
…
hydroponics
Merge branch 'master' into upstream-merge-14957
2023-06-09 22:27:00 -04:00
icon generation
…
identification
…
instruments
Spell Fixes
2023-06-19 04:40:45 +00:00
integrated_electronics
FIXES #4930 Circuit Examine Text
2023-07-08 15:13:29 -05:00
interserver shipping
…
keybindings
…
library
Spell Fixes
2023-06-19 04:40:45 +00:00
lighting
Merge pull request #15098 from Very-Soft/redgate
2023-07-01 22:31:02 +00:00
looking_glass
…
lore_codex
fix merge conflicts
2023-06-19 12:32:36 +02:00
makeup
…
maps
…
materials
[MIRROR] Staves (#6684)
2023-07-30 16:16:00 +02:00
media
…
mentor
runtime fix
2023-07-07 11:11:53 +02:00
metric
…
mining
Merge pull request #5714 from Cyrelius/Weapons/Armour
2023-06-23 23:44:04 -07:00
mob
Update positive_ch.dm
2023-07-29 23:33:50 +12:00
modular_computers
Spell Fixes
2023-06-19 04:40:45 +00:00
multi-tile
…
multiz
Merge pull request #15080 from Runa-Dacino/hotfixclimbing
2023-06-26 18:24:04 +00:00
nano
…
news
…
nifsoft
Update nif.dm
2023-07-13 21:54:56 +10:00
organs
Merge branch 'master' into technomancer
2023-07-07 19:57:14 +02:00
overmap
Merge branch 'master' into upstream-merge-14976
2023-06-17 14:47:37 +02:00
paperwork
More 515 Compatibility
2023-06-05 21:21:35 +00:00
pda
Merge pull request #15024 from Runa-Dacino/pdafix
2023-06-15 21:14:49 +00:00
persistence
Merge pull request #14681 from VOREStation/upstream-merge-9029
2023-03-14 08:08:13 +00:00
Phorochemistry
…
planet
A few nullchecks
2023-06-07 20:20:47 +02:00
player_tips_vr
…
power
merge conflict
2023-06-23 20:55:47 +02:00
projectiles
[READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360)
2023-07-31 15:00:03 +02:00
radiation
…
random_map
More 515 Compatibility
2023-06-05 21:21:35 +00:00
reagents
Fixes Toxic Blood (#6657)
2023-07-26 11:21:03 +02:00
recycling
Merge pull request #15029 from Runa-Dacino/disposals
2023-06-16 06:30:29 +00:00
research
fix mech medigun not being available.
2023-07-07 11:00:18 +02:00
resleeving
Spell Fixes
2023-06-19 04:40:45 +00:00
rogueminer_vr
Tweaks and tidying
2023-07-03 10:24:10 +00:00
scripting
More 515 Compatibility
2023-06-05 21:21:35 +00:00
security levels
…
shieldgen
Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds
2023-06-18 16:27:37 +02:00
shuttles
More 515 Compatibility
2023-06-05 21:21:35 +00:00
spells
…
stockmarket
…
surgery
Update organs_internal.dm
2023-05-10 22:16:23 +12:00
tables
Adds Custom Subtle verb
2023-07-15 20:03:42 +00:00
telesci
Tweaks and tidying
2023-07-03 10:24:10 +00:00
tension
fix merge conflicts
2023-06-17 13:38:08 +02:00
tgs
fix merge conflicts
2023-06-17 15:57:46 +02:00
tgui
Merge remote-tracking branch 'CHOMPStation2/upstream-merge-14933' into big-new-tgui-pr
2023-06-19 18:13:57 +02:00
tgui_input
TGUI Input Checkboxes
2023-06-01 21:12:22 +00:00
tools
…
tooltip
More 515 Compatibility
2023-06-05 21:21:35 +00:00
turbolift
…
vchat
More 515 Compatibility
2023-06-05 21:21:35 +00:00
vehicles
[READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360)
2023-07-31 15:00:03 +02:00
ventcrawl
Fixes simple_mob ID giving system
2023-04-14 22:38:41 +00:00
virus2
[MIRROR] /tg/ era language pass
2023-03-13 05:23:57 +00:00
vore
Adds liquidbelly overlay max height setting (#6689)
2023-07-31 14:08:28 +02:00
webhooks
More 515 Compatibility
2023-06-05 21:21:35 +00:00
whitelist
…
xenoarcheaology
Update find_spawning.dm
2023-07-14 23:37:46 +02:00
xenobio
…
xenobio2
…
xgm
powder that makes you say yes
2023-03-17 02:22:16 -04:00