cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-07 07:00:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,111 Commits 10 Branches 0 Tags
b90f7ec922fab98166ddb6471619ef181894de38
Commit Graph

2619 Commits

Author SHA1 Message Date
RadiantFlash7
723c3d63be Mapping work+lumber lockers 
Added some structures DMI's to use, adjusted mining+part of xenoarch,
did a lot of work on lower level and maint level, added a few closet
variants for lumberjacks
 2018-08-05 13:21:22 -04:00
Anewbe
ef131135f0 Corgi rune now summons the corgi in a flash of harmless lightning 2018-08-03 16:58:42 -05:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Neerti
6bdf355e6d Finishes thunderstorms. 2018-07-31 14:45:26 -04:00
Neerti
8639d49c34 Begins work on lightning. 2018-07-28 11:08:30 -04:00
Neerti
8faa8c5c9c Fireaxe cabinets find their fireaxes in initialize(), rather than new() 2018-07-27 02:16:58 -04:00
Anewbe
bca0350348 Fireaxe cabinets find their fireaxes in initialize(), rather than new() 2018-07-26 22:42:36 -05:00
Anewbe
0abdfff854 Merge pull request #5439 from Neerti/layer_fixes 
Fixes layering issues for a few things
 2018-07-25 17:27:05 -04:00
Neerti
066975bad0 Fixes some layering issues with trees, outdoor turf edges, and the targeting indicator. 2018-07-24 13:30:09 -04:00
Anewbe
f5312bcedd Refactors supply controller 2018-07-24 11:04:16 -04:00
atermonera
95398466de refactors supply controller 2018-07-22 13:44:44 -07:00
Atermonera
415d632261 Merge pull request #5427 from Anewbe/fireaxe_cabinet 
Fixes the fireaxe cabinet
 2018-07-22 02:11:24 -04:00
Anewbe
705203dc67 Fixes the fireaxe cabinet 2018-07-20 19:06:20 -05:00
Repede
1b5cb2bafa Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 2018-07-17 20:30:33 -04:00
Anewbe
a3835d42f4 Merge pull request #5397 from Atermonera/boilerplate_list_fix 
Global list boilerplates cause the target path to actually add to the list
 2018-07-09 22:52:12 -04:00
atermonera
a5eb8954ab new() was missing ..() 2018-07-08 13:48:40 -07:00
RadiantFlash7
aedd717e53 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-30 17:48:00 -04:00
Hawk_v3
8aa6aa85bc Merge remote-tracking branch 'upstream/master' 2018-06-29 22:32:22 +01:00
Hawk_v3
9a38e88b9f Blueshield updates. New shotgun. 
Semiauto revolver shotgun for Blueshield and Warden. Sprites are placeholder.

Blueshield spawn gear boxes for weapon choice now.
 2018-06-29 15:03:01 +01:00
Repede
d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-29 09:58:53 -04:00
Repede
9155e62b5c Blueshield tweaks and map_template.dm typo fix 2018-06-28 00:23:41 -04:00
RadiantFlash7
064bcba242 Chapel/monastary, Prison, library/cafe partway 
Chapel area and new chaplain pet 'Ignis', Finalized most of the prison,
added a new monastary to be used by the chaplain/monk, and serves as a
public garden for the crew.
Partway done with cafe and library, currently under work.
 2018-06-26 19:11:15 -04:00
Verkister
d1ab58b7f8 Little tweaks etc. 
-Renamed heckboy paths.
-Fixed a sprite inconsistency.
-New latin names.
-Feral red changed to cult faction.
-Changed red tame chance to 20%.
-Made "experimental environment" otie crate have a 20% chance to contain a friendly red instead of phoron.
 2018-06-25 11:33:19 +03:00
Verkister
49e7cb1bcd Adds "redspace" oties. 
-Stats-wise identical to phoron mutants for now.
-Can appear in dangerous pred crate.
-Commissioned for shenanigans etc.
 2018-06-24 16:34:24 +03: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
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
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
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
469f2c7b22 Adds shotgun shells to Blueshield locker 2018-06-14 20:33:54 -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
Repede
3c07607014 Fixes to map branch to allow blueshield job in 2018-06-13 00:22:19 -04: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
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
Repede
b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm
 2018-06-02 18:33:44 -04:00
Anewbe
b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 16:23:08 -04:00
Anewbe
9d44725112 Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 15:22:05 -05:00
Arokha Sieyes
53cb0b70a5 Radiation closet hood fix 2018-06-01 23:52:00 -04:00
Arokha Sieyes
c0c091ed4a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018 
# Conflicts:
#	code/modules/power/lighting.dm
#	icons/turf/walls.dmi
 2018-05-29 21:05:27 -04:00
Anewbe
d308cb4563 Merge pull request #5269 from deathride58/fancylighting 
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
 2018-05-29 13:33:27 -05:00
Verkister
1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes
b96aec1e52 SYNC: Missed another closet (typo) 2018-05-27 19:53:45 -04:00
Arokha Sieyes
1437123502 SYNC: Missed one 2018-05-27 19:43:39 -04:00