cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,211 Commits 8 Branches 0 Tags
4cf7f71be6d1720990445cb41ff187d3a5fcd2c5
Commit Graph

1050 Commits

Author SHA1 Message Date
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
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
RadiantFlash7
9dd30878ac Update code/modules/research/designs/engineering.dm 
Second comment tag

Co-Authored-By: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com>
 2020-02-09 11:35:30 -05:00
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
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
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
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Novacat
5cac43ef0e Merge pull request #6480 from VOREStation/upstream-merge-6628 
[MIRROR] Adds a mega cooking recipe
 2020-01-21 01:26:48 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Atermonera
7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building 
Can now (de)construct chem masters
 2020-01-15 23:16:19 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Anewbe
249a05e888 Merge pull request #6554 from Nalarac/Cellicon 
Protolathe Power Cells Tweak
 2019-11-29 19:49:48 -05:00
Hawk-v3
c7e41b1c24 Merge branch 'master' into master 2019-11-02 10:43:44 +00:00
RadiantFlash7
8cca4cb043 Comments out Stripper cell 
...We do not need to give science the ability to instantly strip anyone, including ERT, Deathsquad, etc..

This was a bad idea all around.
 2019-11-01 23:56:47 -04:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Repede
22e602deb3 Merge branch 'master' into larger_bodybags 2019-10-17 20:09:00 -04:00
TrilbySpaceClone
77b13577a1 grave storge 2019-10-16 21:18:18 -04:00
Hawk_v3
8edc441c63 Renames for descriptiveness. 
R&D now knows exactly what every device is.
 2019-10-12 21:43:52 +01:00
Trilbyspaceclone
56dde59333 Update power_cells.dm 2019-10-09 11:52:26 -04:00
Trilbyspaceclone
f3b8e49fbd Update power_cells.dm 2019-10-09 11:47:29 -04:00
Trilbyspaceclone
adf9ff0cf1 corrects item paths 
cells were already taken, my bad
 2019-10-09 11:26:36 -04:00
Hawk-v3
9f3802b9a0 Revert "Adds in two new cells for sci to get!" 2019-10-09 16:14:07 +01:00
TrilbySpaceClone
c245955ead Suggestions 2019-10-05 22:20:05 -04:00
Trilbyspaceclone
5eae6a4200 Update power_cells.dm 
Why did this complie locally?
 2019-10-05 18:42:17 -04:00
TrilbySpaceClone
af68971451 maybe it just works 
whom knows
 2019-10-05 18:12:59 -04:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Heroman
3ea943f9ad Sorts vorestation-only rnd recipies 2019-09-26 18:41:54 +10:00
Novacat
794bf4c648 Update weapons.dm 2019-09-26 03:10:04 -04:00
Atermonera
0b31dcace5 Properly sorts all protolathe designs 2019-09-26 03:00:43 -04:00
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Trilbyspaceclone
0a6dace356 Update medical.dm 2019-09-18 20:14:50 -04:00
Heroman3003
caf274951c Implements ML-3M, Adds prototype NSFW 2019-09-17 11:24:58 +10:00
Unknown
e404d95df0 Adds rig modules to R&D 2019-09-09 10:23:19 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Novacat
dd7a7842ed Merge pull request #5567 from Novacat/nova-survival 
Adds Prototype Hypospray
 2019-08-12 13:15:35 -04:00
Novacat
75e53b8fc9 Update mechfab_designs.dm 2019-08-08 16:30:44 -04:00
Novacat
eced9eda28 Update circuits.dm 2019-08-08 16:30:08 -04:00
Andrew
9d93bea992 Allows Construction of Serenity in Robotics 2019-08-08 16:28:07 -04:00
Unknown
1fb88e40e2 Adds Prototype Hypospray 
- Can be researched and manufactured by Science
- Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents

Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again.
 2019-08-06 20:54:14 -04:00
Anewbe
341832b995 Merge pull request #6364 from Nalarac/Mecha2 
Fixes Ripley Speedboost Being Uncreatable
 2019-08-02 13:57:07 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Atermonera
f0311ed4ff Merge pull request #6304 from Nalarac/Mecha2 
Adds Ripley Speedboost Equipment
 2019-07-24 00:02:48 -04:00
Novacat
d5f0f35519 Merge pull request #5357 from Wickedtemp/master 
Allows New Serenity Mech To Be Constructed
 2019-07-17 17:35:41 -04:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00