cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-04 13:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 10 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

8353 Commits

Author SHA1 Message Date
Repede
8ea0e21fc6 Merge branch 'master' of https://github.com/Repede/YawnWiderStation into self 
# Conflicts:
#	icons/mob/robots.dmi
 2018-06-23 17:58:41 -04:00
Repede
2b0aff0b6d Merge branch 'master' into self 
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types_vr.dm
#	icons/obj/tank_vr.dmi
 2018-06-23 17:56:05 -04:00
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-23 17:53:13 -04:00
Repede
509311613b Merge pull request #127 from Repede/self 
Dabs on NIFs, also adds NSFW kit to blueshield locker until we make t…
 2018-06-23 12:39:12 -04:00
Repede
4145525a1a Dabs on NIFs, also adds NSFW kit to blueshield locker until we make the custom gun kit 2018-06-23 12:38:20 -04:00
Sharkmare
2cbfb05a4a Making Circuit debugger fit in toolbelt 
Because both the multitool and the Circuit wirer fit in already.
 2018-06-20 03:39:09 +02:00
Michael Gosselin
e24d3fc670 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-17 19:23:58 -04:00
Michael Gosselin
38248380f4 R-UST Remapping. 
Re-maped the R-UST to use proper Radiation shielded blast doors.
Shifted R-UST control room down to allow exiting through the Engine SMES
room.
Removed magic snowflake glsss that blocks radiation and replaced it with
normal borosilicate glass.
Re-wrote part of the Engine setup guide to reflect the altered setup
engine setup.
 2018-06-17 19:23:44 -04:00
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Atermonera
32557da8f2 Merge pull request #5356 from Anewbe/recharger_refactor 
Recharger refactor
 2018-06-16 14:15:15 -07:00
Repede
927dd94cc5 Merge pull request #120 from gozulio/master 
R-UST Engine and Guide rework
Yolo
 2018-06-16 14:40:35 -04:00
Aronai Sieyes
c6fae09c1d Merge pull request #3888 from VOREStation/upstream-merge-5322 
[MIRROR] Move planets to SSplanets
 2018-06-16 13:57:09 -04:00
Repede
f58492b1bf Merge pull request #119 from Repede/self 
Fix for blueshield (maybe) + adding Harpsong's vest (Needs added to fluff)
 2018-06-16 11:19:19 -04:00
Aronai Sieyes
62b5386eb3 Merge pull request #3890 from VOREStation/upstream-merge-5337 
[MIRROR] Folders props, and adds the laser prism, receptor, and sealed doors.
 2018-06-16 10:51:29 -04:00
Aronai Sieyes
abd67bb983 Merge pull request #3889 from VOREStation/upstream-merge-5282 
[MIRROR] Allows AIs to produce and control maint/construction/mining drones.
 2018-06-16 10:51:20 -04:00
Arokha Sieyes
7c050dd35c Fix merge conflict, update virgo planet things 2018-06-16 10:43:45 -04:00
Michael Gosselin
4b4e3503f8 R-UST Engine and Guide rework 
Rewrote R-UST guide to actually match common R-UTS setup on yawn.
Replaced R-UST chamber floor with Airless floor.
Added a blast door Shroud for the R-UST, Does not block radiation
effectively yet.
added more Borosilicate glass around the engine monitering room and
reactor core.
Mapped special "High Density Borosilicate Glass" that blocks a lot of
radiation.
Removed pointless "Radiation Collector blast doors" button tht does
nothing.
 2018-06-16 04:44:07 -04:00
Repede
41ec39ab59 Fix for blueshield (maybe) + adding Harpsong's vest (Needs added to fluff list) 2018-06-15 23:39:13 -04:00
Mechoid
3c35b7d13a Folders props, and adds the laser prism, receptor, and sealed doors. (#5337) 
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
 2018-06-15 21:42:19 -04:00
Mechoid
313526adb8 Folders props, and adds the laser prism, receptor, and sealed doors. (#5337) 
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
 2018-06-15 20:41:19 -05:00
Mechoid
9b00166de0 Allows AIs to produce and control maint/construction/mining drones. (#5282) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
 2018-06-15 20:15:03 -04:00
Mechoid
4cd51ff79f Allows AIs to produce and control maint/construction/mining drones. (#5282) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
 2018-06-15 19:14:16 -05:00
Anewbe
98b3af60fa Move planets to SSplanets 2018-06-15 19:05:38 -04:00
Anewbe
9e28740697 Merge pull request #5322 from VOREStation/pol-planetstart 
Move planets to SSplanets
 2018-06-15 18:05:25 -05:00
Hawk_v3
15403798d8 Fixed missing backsprites 
Forgot about those. I simply renamed the tanks as the old one was removed anyway. Apologies.
 2018-06-15 22:49:38 +01:00
Hawk_v3
1db1280651 Merge remote-tracking branch 'upstream/master' 2018-06-15 22:46:14 +01:00
Hawk_v3
bd6c3a6102 Merge remote-tracking branch 'upstream/master' 2018-06-15 22:41:50 +01:00
Hawk_v3
e698051d94 Fixed missing back sprite. 
So yeah, I forgot to change the back sprite name. Might as well just make the tanks match the back sprites since I removed the old ones.
 2018-06-15 22:40:41 +01:00
Aronai Sieyes
a162c86d51 Merge pull request #3855 from VOREStation/upstream-merge-5341 
[MIRROR] Wires are under catwalks, fueltanks are over floor decals
 2018-06-15 08:57:22 -04:00
Repede
367b8f978a Merge pull request #117 from Repede/self 
Fixes blueshield not having access
 2018-06-15 08:52:33 -04:00
Repede
5d6e883966 Fixes blueshield not having access 2018-06-15 08:50:06 -04:00
Repede
6854657745 Merge pull request #116 from Repede/self 
Adds shotgun shells to Blueshield locker
 2018-06-14 20:35:31 -04:00
Repede
469f2c7b22 Adds shotgun shells to Blueshield locker 2018-06-14 20:33:54 -04:00
Repede
27e243a0fa Merge pull request #115 from Repede/self 
Makes blueshield less snowflake
 2018-06-14 20:13:14 -04:00
Repede
420c8a2159 Makes blueshield less snowflake 
- fixes title to 'Blueshield Guard'.
 - closet has a shotgun with beanbags instead of a X01 custom fluff weapon.
 2018-06-14 19:54:27 -04:00
Anewbe
91edca4434 Recharger refactor 2018-06-14 15:37:22 -05:00
Repede
483a05c4f1 Merge pull request #110 from Repede/mapself 
Here goes nothing, blueshield addition and locker on tether
 2018-06-13 08:25:50 -04:00
Repede
3c07607014 Fixes to map branch to allow blueshield job in 2018-06-13 00:22:19 -04:00
Hawk_v3
9a3933517d Fix and Additions to Vox Tanks 
Fixed Vox double tanks spawning in internal boxes.
Added indicator to Vox back tank, shifted sprite two pixels to reuse double tank indicators.
Added strip to Vox emergency tank to bring in line with back and double tanks.
 2018-06-12 17:59:38 +01:00
Unknown
ebfaf885f3 Fix and Additions to Vox Tanks 
Fixed Vox double tanks spawning in internal boxes.
Added indicator to Vox back tank, shifted sprite two pixels to reuse double tank indicators.
Added strip to Vox emergency tank to bring in line with back and double tanks.
 2018-06-12 17:06:31 +01:00
RadiantFlash7
aa90708218 Guitarr, blueshield on tether 
WIP Guitar, Blushield on the tether
 2018-06-11 22:30:34 -04:00
RadiantFlash7
0d74a52ed1 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-11 21:27:21 -04:00
RadiantFlash7
9d46e68742 blueshield, more clothes/vests, more weapons, phorochem fixes, 
Map additions, Phorochem interface fix, some phoreagents fixed, Added
gauss weaponry and blueshield x01, added blueshield role with
uniform/closet.
 2018-06-11 21:27:11 -04:00
Aronai Sieyes
97465264c3 Merge pull request #3840 from VOREStation/upstream-merge-5323 
[MIRROR] Wallet money spawns as a bundle.
 2018-06-11 06:08:31 -04:00
Ketrai
c351f1d3b0 Adds a fennec crate to cargo. (#3810) 
* Adds a fennec crate.

Adds a fennec crate with a smaller chance of containing fennix.

* Adds a fennec crate

* Update hydroponics_vr.dm

* Fixes an error?

* Update largecrate_vr.dm

* Update largecrate_vr.dm
 2018-06-11 06:06:49 -04:00
Repede
f772d7622c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-06-10 21:19:07 -04:00
Atermonera
d768871055 Merge pull request #5341 from Anewbe/catwalks_again 
Wires are under catwalks, fueltanks are over floor decals
 2018-06-10 15:41:54 -04:00
Anewbe
05fa92c489 Wires are under catwalks, fueltanks are over floor decals 2018-06-09 13:26:30 -05:00
Atermonera
190dd08fc4 Merge pull request #5323 from Anewbe/loadsamoney 
Wallet money spawns as a bundle.
 2018-06-06 19:08:31 -04:00
Atermonera
82628ef097 Merge pull request #5323 from Anewbe/loadsamoney 
Wallet money spawns as a bundle.
 2018-06-06 16:07:53 -07:00