Commit Graph

12065 Commits

Author SHA1 Message Date
SinTwo
9b51c352ae AS-24 Fix #2 + ignore
Ignore hides database config for hopeful database fix(?)
2015-08-18 18:09:48 -04:00
Neerti
4ddf90d8f7 Merge pull request #159 from Woodratt/Woodrat_work_8.0
Woodrat Work 8.0 Boot Knife DLC
2015-08-18 00:35:06 -04:00
Woodrat
7d65038d38 Woodrat Work 8.0 Boot Knife DLC
- Industrial Hardsuit RCD removed
- Single Action figure added to the vacant shop.
- Comfort creature added to the psych office.
- Piping underneath the holodeck control doors removed.
- Firelocks along the fore part of the central ring now glasslocks
- Air Alarms added to the cyborg station, upload foyer, messaging server room.
- Light switch, fire alarm radio, and air alarm added to secondary tool storage.
- Coffee shop shutters and door properly labeled.
- Status display added to the IA office.
- Second photo album added to the detective’s office.
- Removed forgotten items on mining z-level. I.E. I screwed up.
- Atmos backwards pumps should be fixed and sorted.
- Distro and waste lines tweaked in atmos.
- Crowbars should now be dispensed from oxy wall lockers.
- Tweaked the variables on the outpost SMES units. New SMES added to the mining engineering outpost.
- Pill cabinets added to the medbay at central.
- Mulebots should have proper access now.
- Overhaul to parts of the mining z-level. Fixed several issues brought up.
- Spoons added to the cafeteria
- One extra ERT suit for each role added to the ERT area.
- New item, combat knife. Should be robustier than the tactical knife. Available for ERT and two for the mercs.
- New item, marine boots. Basically just renamed jackboots at the moment.
- Tactical Knives and combat knives can now be put into swat boots and marine boots.  Depending on how well the feature works will be expanded to include other boots.
2015-08-17 20:47:05 -07:00
SinTwo
5b1b79df6d Fixes/Adds AS-24 Shotgun 2015-08-16 21:36:36 -04:00
SinTwo
14b2114598 AS-24 Shotgun
Adds the AS-24 Shotgun.
2015-08-16 19:28:06 -04:00
Neerti
f407f9aa22 Merge pull request #137 from Woodratt/Woodrat_Work_7.8
Woodrat Work 7.8 "Tiny mini skirt edition"
2015-08-09 02:29:38 -04:00
Woodrat
b8c0c5ca5d Woodrat Work 7.8 "Tiny mini skirt edition"
- Added jumpskirts to their department lockers.
- Fixed minor code issue with the QM skirt
- Single scientist wardrobe added to research rest room
- Removed robust cola machine from gateway, added laptop vendor in its stead.
- Two universal recorders added to the main map. Captain's office and art storage.
- Adjusted and added cameras to the doc area to improve coverage.
- Adjusted cameras in primary hallway leading to the dock for coverage purposes.
- Added newscaster to central park.
- Finalized work on the large dorms/visitor housing.
- Added CM sprite for frag grenades for our grenades, also lessened the size of the explosion to (-1,-1,3) from (-1, -1, 4) in a vain attempt to make the blast radius smaller. They shouldn't be too much weaker but...
- Sprite for a box of frag grenades added, box of 7 frag grenades also added to code.
- Two merc op TTVs removed, one left behind. One box of frags and 6 blocks of c4 added to merc op shuttle in their stead.
- One box of frag grenades added to ERT armory.
2015-08-08 23:18:39 -07:00
Mark9013100
1b014ef703 Minor ERT/Central changes 2015-08-08 14:21:00 -04:00
Mark9013100
17b6d4e3c7 Sec soft cap sprite improvements & ERT rig pathfile 2015-08-08 08:40:56 -04:00
Mark9013100
b601310f9b Men in black 2015-08-08 06:01:35 -04:00
Neerti
1c8a395bcf Adds jumpskirts for engineering, medical, and cargo. 2015-08-07 23:39:40 -04:00
Neerti
9e6eef57f7 Makes windows require only one sheet per window if it's not a 'full' window. 2015-08-07 21:34:04 -04:00
Neerti
a8c4245245 Merge pull request #129 from Neerti/8/7/2015_bay_merge
Syncs to Bay (8/7/2015)
2015-08-07 20:33:48 -04:00
Neerti
d911badae8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
Conflicts:
	.travis.yml
	polaris.dme
2015-08-07 20:25:57 -04:00
Mark9013100
a86443b7ae ecks dee 2015-08-07 11:04:04 -04:00
PsiOmegaDelta
a6d9002806 Merge pull request #10442 from Baystation12/dev-freeze
Dev freeze
2015-08-07 10:37:47 +02:00
PsiOmegaDelta
8ca5d01dcf Crematorium Destroy()
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
2015-08-06 08:39:24 +02:00
PsiOmegaDelta
863832b347 Post-merge fixes.
Renames define.
Re-corrects access checks.
2015-08-06 08:18:39 +02:00
PsiOmegaDelta
03578d4ea3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-06 08:12:38 +02:00
PsiOmegaDelta
87fcd408bd Merge pull request #10436 from mwerezak/cult-construct-nightvision
Adds nightvision to cult constructs
2015-08-06 06:38:49 +02:00
mwerezak
0bc9468022 Merge pull request #10431 from PsiOmegaDelta/150805-HoloRuntime
Fixes holodeck runtime.
2015-08-05 23:06:04 -04:00
mwerezak
e5950d32d8 Merge pull request #10264 from RavingManiac/dev-freeze
Refactors floating and magboot checks. Fixes #10256
2015-08-05 23:05:34 -04:00
PsiOmegaDelta
cf1ffd273a Fixes holodeck runtime.
initial() doesn't work well with lists. Causes a null value.
2015-08-05 09:33:34 +02:00
PsiOmegaDelta
73a9c24017 Removes code in mob/living/bot/Life() that is now handled by mob/living/Life(). 2015-08-05 09:26:43 +02:00
PsiOmegaDelta
3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta
6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
GinjaNinja32
c71d78ab1a add debug verb as pAI-spawning adminverb 2015-08-05 00:50:04 +01:00
GinjaNinja32
595b58197d fix pAI radios not working 2015-08-05 00:49:28 +01:00
GinjaNinja32
117ffca6d0 Merge pull request #10423 from Kelenius/ofBotsAndZAS
Of bots and ZAS
2015-08-04 13:26:30 +01:00
GinjaNinja32
9a4b53c765 Merge pull request #10360 from atlantiscze/beep-beep-beepsky
Fixes #10355
2015-08-04 12:36:35 +01:00
PsiOmegaDelta
93011f94c4 Merge pull request #10425 from Baystation12/dev-freeze
Dev
2015-08-04 13:07:11 +02:00
Kelenius
e935baf1d8 Fixes #10418 - bots don't remover from stuns 2015-08-04 12:41:32 +03:00
Neerti
95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync
Conflicts:
	polaris.dme
2015-08-03 22:13:18 -04:00
GinjaNinja32
70c302ad03 Merge pull request #10415 from PsiOmegaDelta/150803-LightingRuntime
Fixes #10409.
2015-08-04 00:47:11 +01:00
GinjaNinja32
a099fc4401 Merge pull request #10413 from PsiOmegaDelta/150803-Cleanup
Removes debug proc.
2015-08-04 00:46:40 +01:00
mwerezak
76ceaa904b Fixes admin or event spawned antags not spawning
Pending players were selected but the antag roles were never finalized.
2015-08-03 12:06:23 -04:00
RavingManiac
aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
PsiOmegaDelta
c25212463a Fixes #10409.
Ports https://github.com/ParadiseSS13/Paradise/pull/1622.
2015-08-03 10:15:24 +02:00
PsiOmegaDelta
34ad83baae Removes debug proc.
It isn't needed.
2015-08-03 09:31:40 +02:00
Atlantis
ad45e5d16b Implements req_one_access for bots, as per request on GitHub discussion. 2015-08-02 23:23:18 +02:00
PsiOmega
f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
2015-08-01 19:45:42 +02:00
PsiOmegaDelta
f8799035f4 Merge pull request #10400 from Baystation12/master
Master -> Dev-Freeze
2015-08-01 19:44:22 +02:00
mwerezak
f2bfc5a720 Merge pull request #10397 from Zuhayr/dev-freeze
Fixes
2015-08-01 13:02:23 -04:00
GinjaNinja32
495f80fff6 Change callproc to check validity earlier
Callproc now checks validity of a call *before* prompting for arguments, instead of after, and can now check the validity of global (/proc/foo) procs.
2015-08-01 17:19:36 +01:00
Zuhayr
71433e024d Merge pull request #10388 from mwerezak/light-suit
Cybersuit and sprite fixes
2015-08-02 01:13:46 +09:30
Zuhayr
840b5b756b Fixes #10358, #10359 and #10257 2015-08-01 23:17:27 +09:30
Zuhayr
2a51b778d6 Fixes #9611 2015-08-01 21:10:48 +09:30
Mloc
f04ca77bfb revert chargen rendering rework
fixes #9733

Signed-off-by: Mloc <colmohici@gmail.com>
2015-08-01 11:35:53 +01:00
Neerti
2193ff9549 Merge pull request #56 from Woodratt/Woodrat_Work_5
Commit verison v5 Pre-Alpha Playable Release
2015-08-01 03:19:15 -04:00
Woodrat
2420f05034 Commit verison v5 Pre-Alpha Playable Release
Changes -

- Research
  - Work finalized on Research, all extra items such as newscasters, alarms, fire extinguishers added. Cargo drop of point added Door access completed, landmarks and spawn points added, floor painted. No further major changes to be made to research.

- Cargo
  - Work finalized, One new area added (second one to be added at a later date but causes no issues at this point). No major changes to be done to cargo at this time.

- Security
  - Work finalized, brig cells work properly, cargo drop off point made, cameras added, blastdoors working properly, no major changes to be made.

- Medical
  - Work finalized, hallways painted, shutters working properly, cameras added, virolocks functional. Cargo drop off point to still be added. No major changes to be done.

- Command
  - Work in Progress, door access done including AI and AI upload, landmarks added, few light changes such as additional lights to the bridge. No major changes to be done

- Engineering
  - Work in Progress, door access done, cargo drop off point added. Materials supplied, engineering 'elevator' functional. Blast doors need to be added. Detail work needs to be added. No major changes to be done.

- Civilian
  - Work in Progress, door access should be finalized for areas such as the bar, kitchen, hydroponics coffee shop. Chapel driver now operational. Several areas with cameras, several areas still lacking cameras. Detail work missing such as newscasters and fire alarms. No major changes to be done.

- Misc
  - Work in Progress,
    - Tech storage access completed. Security checkpoint door control and access done.
    - Airlock next to the research fixed. Waste disposals tweaked and fixed.
    - Work completed on EVA, finalized. No further changes.
    - IAA access and landmarks completed.
    - Holopads added to areas previously without such as in front of escape pods.

- Other Tweaks
  - Light ranges increased for both small and large lights.
  - Small lights have had their color changed to a much fainter tint
  - Comfy Chair tweak pending.
2015-08-01 00:02:29 -07:00