Commit Graph

32 Commits

Author SHA1 Message Date
Alberyk 04fbeddf36 Compile errors round 2 by Alberyk (#3) 2016-10-15 21:53:09 +03:00
PsiOmegaDelta 12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
2015-12-13 10:47:33 +01:00
PsiOmegaDelta f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
Zuhayr 7a9d7bf0c9 Fixes #10753 2015-12-10 10:41:48 +10:30
PsiOmegaDelta 665776f400 Merge pull request #11570 from Raptor1628/dev
Security Gear II
2015-12-03 21:22:34 +01:00
Raptor1628 2cd5a49498 Security Gear II
Collection of Security changes:

New heavy vest sprites, replacing the old toggle system.
New helmet sprites.
Heavy vests reduced to 2 pockets.
Regular vests have no pockets.
Holobadge sprite change and badge addition for HoS/Warden.
Teargas Grenades, replace flashbangs in vendor and officer lockers,
flashbangs located in armory and with warden.
Detective 1911 starts with flash magazine, has one rubber magazine in
locker.
Rubber bullet damage halved to reduce frequency of bone breakage and IB.
Flash bullet buffed to cause small halloss.
Armory loadout changed to static 4 e-guns, 4 laser guns, 2 ion rifles, 2
shotguns starting loaded with beanbags, 4 Mk 58s loaded with flash
rounds.
Tactical armor removed, still available in cargo.
Sub-Armory restored to warden access only, officer access storage rack
added.
Now with Changelog.

Threads and Polls located here:

http://baystation12.net/forums/threads/discussion-poll-security-energy-weapons-antag-projectile-weapons.932/

http://baystation12.net/forums/threads/discussion-poll-detective-weapon.865/
http://baystation12.net/forums/threads/discussion-armory.792/

http://baystation12.net/forums/threads/discussion-security-vest-and-helmet.790/

Quick Fix

	modified:   code/datums/supplypacks.dm
	modified:   code/game/machinery/vending.dm
	modified:   code/game/objects/items/devices/uplink_items.dm
	modified:   code/game/objects/items/weapons/grenades/chem_grenade.dm
	modified:   code/game/objects/items/weapons/storage/boxes.dm
	modified:   code/game/objects/structures/crates_lockers/closets/secure/security.dm
	modified:   code/modules/clothing/suits/armor.dm
	modified:   code/modules/clothing/suits/storage.dm
	modified:   code/modules/clothing/under/accessories/badges.dm
	modified:   code/modules/projectiles/guns/projectile/pistol.dm
	modified:   code/modules/projectiles/projectile/bullets.dm
	modified:   code/modules/projectiles/projectile/energy.dm
	modified:   code/modules/random_map/drop/drop_types.dm
	new file:   html/changelogs/Raptor1628-Dev.yml
	modified:   icons/mob/belt.dmi
	modified:   icons/mob/head.dmi
	modified:   icons/mob/suit.dmi
	modified:   icons/mob/ties.dmi
	modified:   icons/obj/clothing/hats.dmi
	modified:   icons/obj/clothing/suits.dmi
	modified:   icons/obj/clothing/ties.dmi
	modified:   maps/exodus-1.dmm
	modified:   maps/exodus-2.dmm
2015-12-02 13:42:41 -05:00
Zuhayr f89edb8e80 Fixes drop pods activating each other's doors. 2015-12-02 18:15:59 +10:30
Zuhayr f4c9bc4be6 Amending some loc setting lines. 2015-08-25 12:40:09 +09:30
Zuhayr 77e0a72911 Adding tag to droppod mobs prior to being moved into the target area. 2015-08-24 19:13:43 +09:30
Zuhayr b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
Conflicts:
	code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30
Zuhayr 8e0ff6c69f Runtime fix (hopefully), less dangerous qdel loop for pods. 2015-08-22 03:53:03 +09:30
Zuhayr c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
PsiOmegaDelta 985acc9f70 Changes the supply drop types into datums. Simplifies adding additional supply packs. 2015-08-13 12:11:18 +02:00
Zuhayr f6df7df714 Added diona gestalt preset. 2015-08-13 16:59:37 +09:30
Zuhayr 231eaf7e76 Added antag uplink option for hacked supply pod. 2015-08-13 16:59:18 +09:30
Zuhayr a8b801b377 Added supply beacon. 2015-08-13 16:59:18 +09:30
Zuhayr 1b840a6efc More work on pods, added personnel pod. 2015-08-13 16:59:18 +09:30
Zuhayr 31ffc91d47 Added supply drops. 2015-08-13 16:59:17 +09:30
Zuhayr dd41dfa16a Random map generator fixes, cleanup 2015-08-13 16:59:16 +09:30
Zuhayr ebe62cefd8 Refactored random map generator system and added several terrain generators.
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
PsiOmega eca7569077 Clean server start.
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
2015-04-18 15:32:25 +02:00
Zuhayr c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
Zuhayr 7ed0e26b59 Readded asteroid secret placement, adjusted some values. 2015-01-23 13:40:10 +10:30
Zuhayr 2cfd15e828 Removes abortive attempt at map generator for now. 2015-01-23 13:40:09 +10:30
Zuhayr 5c37b9e58c Committing some maze fixes and trying to reproduce a weird DD bug. 2015-01-23 13:40:06 +10:30
Zuhayr cd494cdef1 Added masking turf for asteroid field, fixed issues with distribution map. Replaced asteroid field with mask turf. 2015-01-23 13:40:05 +10:30
Zuhayr 786c3bb0f7 Removing some debug items. 2015-01-23 13:40:04 +10:30
Zuhayr b663ef64d6 Debugging the mining distribution map. 2015-01-23 13:40:04 +10:30
Zuhayr da610e608b Added a random maze generator, currently broken. 2015-01-23 13:40:03 +10:30
Zuhayr 07793edc85 Converted mining map over to this new system. Currently broken. 2015-01-23 13:40:03 +10:30
Zuhayr a0fab91b35 Added random cave system generator, very basic. 2015-01-23 13:40:02 +10:30
Zuhayr 3fb41affa8 Added random map generator datum. 2015-01-23 13:40:02 +10:30