cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,229 Commits 5 Branches 0 Tags
00fa623c9d9119245998b51bc8d1cc8d7390aea4
Commit Graph

10609 Commits

Author SHA1 Message Date
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
 2015-08-23 01:30:46 -04:00
Neerti
b61b6001a5 Merge pull request #175 from Neerti/8/22/2015_more_ling 
Adds electric lockpick power.
 2015-08-23 01:03:58 -04:00
Neerti
c29b47778f Adds electric lockpick power. 2015-08-23 00:58:27 -04:00
Mark9013100
dff98049c1 Removes wall nanomed access requirement 2015-08-22 22:41:17 -04:00
Woodrat
c192378bab Woodrat Work v8.2 
- Placed missing metal and glass from R&D back into R&D.
- Fixed a broken scrubber pipe on the research outpost catwalk.
- Mining and Research Outpost power issues should not be as major right off the bat. In theory should at least last half the round? Further testing needed.
- Discovery about research and mining elevators made. Filled in more asteroid turf around both, added lights to both.
- Wrong tile used in port security maintenance fixed.
- Second camera added to the AI core cause Koco is a dum dum.
- New door sprites and new door. Mixture between atmos and engieering doors, dual access. Placed on the monitoring room behind the front desk.
- Fixed Filter to phoron on the mining engineering outpost.
- Mining engineering outpost fully camera'd
- Lattice added to underneath heat exchange pipes and around the engine heat exchange pipes.
- Complete and total overhaul of the mining outpost.
- Re-removed the RCD from the industrial hardsuit.
- Blue flags created.
- One blue flag and one red flag added to the laser tag lockers.
 2015-08-22 12:33:27 -07:00
GinjaNinja32
2341d2afa9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
mwerezak
4396e5a5bc Merge pull request #9891 from Zuhayr/dev 
Adds variables for CentComm, NanoTrasen and the station name.
 2015-08-21 14:23:57 -04:00
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Zuhayr
8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
Zuhayr
edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
Zuhayr
bf313ae238 Merge pull request #9851 from mwerezak/armourpen 
Adds armor penetration system
 2015-08-22 02:22:17 +09:30
Zuhayr
55c1331261 Merge pull request #10004 from PsiOmegaDelta/150703-AISight 
Active AI cores now provides camera coverage.
 2015-08-22 02:21:36 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Zuhayr
6c27a8dd8d Merge pull request #9159 from Kelenius/ofClicksAndCooldowns 
Removes click cooldowns almost everywhere.
 2015-08-22 01:51:05 +09:30
Zuhayr
3632acd3db Merge pull request #10786 from PsiOmegaDelta/150821-SortedAccess 
Cleans out unused access definitions and sorts access lists.
 2015-08-22 01:34:08 +09:30
Zuhayr
b4b7719557 Merge pull request #9888 from Vivalas/dev 
[DEV] Re-adds the new uplink item
 2015-08-22 01:34:01 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
PsiOmegaDelta
56523d0941 Cleans out (mostly) unused access definitions and makes access lists sorted. 2015-08-21 14:45:45 +02:00
PsiOmegaDelta
742dde5c25 Gives the medical equipment access a name. 
Requires for guest passes to list the entry. Fixes  #10780.
 2015-08-21 14:01:29 +02:00
Woodratt
e9ed6fe654 Merge pull request #163 from Woodratt/Woodrat_work_v8.1 
Woodrat Work v8.1 "Glasslock Edition"
 2015-08-20 17:01:56 -07:00
Woodrat
7a42e001f8 Woodrat Work v8.1 "Glasslock Edition" 
- Air Alarm added to tool storage and security port maintenance
- Fire Alarm and General Radio added to port emergency shuttle hallway.
- Fire alarm, radios, fire extinguishers, and glasslocks added to the central ring.
- Art Storage now has a light switch
- Blocking walls added to unused airlocks at central. Turret control and more turrets added on central.
- Glasslocks added all the way down the cargo hallway and in cargo. Fire alarms added as well.
- Fore Escape Pod hallway glasslocked and camera'd
- Phoron sheets for engineering generator readded to the crate in hard storage.
- Solar array on the engineering outpost now has a area, more outside lights.
- Cameras installed around the entire central ring.
- Civilian sector and library fully glasslocked.
- Handlabeler and newscaster added to visitor's lobby.
- Downgraded the amount of water used by fire extinguishers from eight to two.
- Changes made to make fire extinguishers useless against slimes half fixed.
- Added fuzzy cuffs
- Rigsuit knives now a option.
- Cameras added all the way through the civilian area hallways.
- AI pet called Steve.
 2015-08-20 16:55:56 -07:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
Chinsky
b2e9a7c2a6 Merge pull request #9942 from RavingManiac/dev 
Sound environment revamp
 2015-08-20 19:47:09 +03:00
Neerti
33c352d879 Merge pull request #161 from Neerti/8/15/2015_new_ling 
New Changeling (Part 1)
 2015-08-20 11:59:57 -04:00
Neerti
ecaf6758df Begins work on new ling. 2015-08-20 11:38:48 -04:00
Zuhayr
c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery 
Uplink Items - Part III
 2015-08-20 19:19:12 +09:30
PsiOmegaDelta
1b64487f8d More computer overlay changes. 
Fixes #10764 and a couple other computers.
 2015-08-20 08:38:43 +02:00
Ccomp5950
11eefbc4c9 Merge pull request #9856 from Hubblenaut/dev 
Beret Resprites
 2015-08-19 17:56:37 -04:00
PsiOmega
c43ce91a99 Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem 2015-08-19 18:25:41 +02:00
PsiOmegaDelta
7241b59a70 Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem 2015-08-19 10:52:04 +02:00
PsiOmegaDelta
f46fcfaf52 Adds more decals. Moving turfs now includes under/overlays. 2015-08-19 10:44:42 +02:00
GinjaNinja32
a9773207b2 Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-19 09:42:48 +01:00
GinjaNinja32
03166ab4e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-19 07:17:03 +01:00
GinjaNinja32
894b559e29 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-19 07:04:40 +01:00
Mark9013100
f27e43998d Gives Mercenaries SWAT boots 2015-08-18 18:19:00 -04:00
mwerezak
5603884095 Removes #undefine 2015-08-18 17:20:39 -04:00
mwerezak
fd8f6d9639 Removes MASK/HEADCOVERSMOUTH 
Code that used to check this flag now checks body_parts_covered for FACE
instead. Added a FLEXIBLEMATERIAL item flag to continue to allow vox to
eat food without poisoning themselves.
 2015-08-18 17:20:36 -04:00
mwerezak
ac738f3db4 Moves flags values to item_flags var 
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
 2015-08-18 17:18:25 -04:00
mwerezak
2cb46e035c Removes unused obj flags and fixes overlapping flags 
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
 2015-08-18 17:08:41 -04:00
mwerezak
70b74518a1 Moves BLOCKHAIR flags to flags_inv 
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
 2015-08-18 17:06:50 -04:00
mwerezak
b80c01ffbe Removes *COVERSEYES 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
 2015-08-18 17:06:49 -04:00
mwerezak
d3a40f4269 Cleans up defines 
Replaces bitflag values with hex literals. Some other miscellaneous
cleanup.
 2015-08-18 17:05:26 -04:00
HarpyEagle
8a9caac7cc Splits species flags 
Splits several species flags off into a separate appearance_flags var, to avoid rollover.
 2015-08-18 17:02:44 -04:00
HarpyEagle
c136bd47cc Improves shard-stepping 2015-08-18 17:01:39 -04:00
GinjaNinja32
9f05c50a7c Merge pull request #10732 from mwerezak/skipjack3 
Fixes #10723
 2015-08-18 18:51:37 +01:00
PsiOmega
e92e819bd9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-18 18:29:01 +02:00