cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
836a47fb2d2473a96185d3b1b3bb9d4565c48ea2
CHOMPStation2/code/modules
History
Aronai Sieyes 836a47fb2d Missed a merge conflict marker
2020-03-15 15:24:05 -04:00
..
admin
Missed a merge conflict marker
2020-03-15 15:24:05 -04:00
ai
Merge pull request #6789 from VOREStation/pol-busysignal
2020-03-05 15:14:36 -05:00
alarm
…
artifice
…
assembly
Merge pull request #6709 from VOREStation/aro-mistake
2020-03-05 19:03:58 -05:00
awaymissions
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
blob
…
blob2
…
busy_space
…
busy_space_vr
…
catalogue
…
client
Vorestation edit fixes
2020-03-15 15:17:27 -04:00
clothing
Rigsuit Slot Updates
2020-03-12 12:30:09 -04:00
customitems
…
detectivework
Merge pull request #6592 from VOREStation/vchat-rebase
2020-03-01 10:51:29 -05:00
economy
Merge pull request #6630 from VOREStation/aro-terminals
2020-03-01 10:52:39 -05:00
entopics_vr
…
error_handler
…
events
MROWL
2020-03-09 02:37:25 -04:00
examine
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
ext_scripts
…
fishing
…
flufftext
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
food
Merge pull request #6811 from Schnayy/mwsprites
2020-03-12 03:21:45 -04:00
gamemaster
Half-Refactors Jobs
2020-03-03 16:28:33 -05:00
games
Ports precision placement of items
2020-02-22 02:35:41 -05:00
genetics
…
ghosttrap
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
holodeck
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
holomap
…
hydroponics
Merge pull request #6709 from VOREStation/aro-mistake
2020-03-05 19:03:58 -05:00
icon generation
…
identification
…
integrated_electronics
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
library
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
lighting
Replaced "area" shuttles with "landmark" shuttles.
2020-03-05 10:29:08 -05:00
lore_codex
Merge pull request #6796 from Cerebulon/newsUpdatemar2020
2020-03-10 03:37:49 -04:00
maps
Replaced "area" shuttles with "landmark" shuttles.
2020-03-05 10:29:08 -05:00
materials
Robotics Expansion: RIG-ged and Ready
2020-03-11 15:56:18 -04:00
media
Fix hook "failing" when no file
2020-03-12 14:12:17 -04:00
metric
Half-Refactors Jobs
2020-03-03 16:28:33 -05:00
mining
Robotics Expansion: RIG-ged and Ready
2020-03-11 15:56:18 -04:00
mob
Fully Implements R_EVENT for Event Managers
2020-03-12 15:01:50 -04:00
modular_computers
Fully Implements R_EVENT for Event Managers
2020-03-12 15:01:50 -04:00
multi-tile
…
multiz
Fix missing incorporeal floatyness
2020-03-08 15:47:36 -04:00
nano
Fully Implements R_EVENT for Event Managers
2020-03-12 15:01:50 -04:00
nifsoft
VS: NIF Category for VChat
2020-02-19 19:55:02 -05:00
organs
Rename to discs_vr.dmi and correct copypaste error
2020-02-29 10:37:41 -05:00
overmap
Fix refueling into fuelports
2020-03-11 22:06:43 -04:00
paperwork
Fully Implements R_EVENT for Event Managers
2020-03-12 15:01:50 -04:00
persistence
…
planet
…
power
Adds more machine button sounds (#6802)
2020-03-11 20:32:06 -04:00
projectiles
Robotics Expansion: RIG-ged and Ready
2020-03-11 15:56:18 -04:00
radiation
…
random_map
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
reagents
Adds more machine button sounds (#6802)
2020-03-11 20:32:06 -04:00
recycling
…
research
Our one special VR construct moves to mechfab, and remove dupes
2020-03-11 16:35:05 -04:00
resleeving
Rework resleeving sickness for voredeaths
2020-03-12 12:48:14 -04:00
rogueminer_vr
Replaced "area" shuttles with "landmark" shuttles.
2020-03-05 10:29:08 -05:00
scripting
…
security levels
Merge pull request #6807 from Neerti/multiline_command_stuff
2020-03-11 02:10:40 -04:00
shieldgen
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
shuttles
Make sure supply shuttle can dock even with codes
2020-03-11 23:57:49 -04:00
spells
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
surgery
Surgery steps to use <span>
2020-03-02 22:35:49 -05:00
tables
Hybrid shuttle
2020-03-05 23:30:07 -05:00
telesci
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
tension
…
tooltip
…
turbolift
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
vchat
Adds VChat tab saving
2020-03-11 19:27:14 -04:00
vehicles
Merge pull request #6787 from VOREStation/pol-latchto
2020-03-05 15:13:22 -05:00
ventcrawl
…
virus2
Fully Implements R_EVENT for Event Managers
2020-03-12 15:01:50 -04:00
vore
Rework resleeving sickness for voredeaths
2020-03-12 12:48:14 -04:00
xenoarcheaology
Merge pull request #6592 from VOREStation/vchat-rebase
2020-03-01 10:51:29 -05:00
xenobio
Merge pull request #6592 from VOREStation/vchat-rebase
2020-03-01 10:51:29 -05:00
xenobio2
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
xgm
Ported Basic Overmap Functionality
2020-03-11 11:11:40 -04:00