Commit Graph

1397 Commits

Author SHA1 Message Date
Ccomp5950
97c0635fad Merge pull request #11927 from comma/devfix
Devfixes
2016-01-07 13:03:26 -05:00
Chinsky
33f3056f1b Changelog 2016-01-07 07:14:29 +03:00
RavingManiac
6e82dfa381 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-04 19:25:36 +08:00
PsiOmegaDelta
d6ccd49489 Updates changelog. 2016-01-01 13:16:16 +01:00
Chinsky
90301c67c1 Merge pull request #11794 from Kearel/qolmystuff
Microwave/Board game QoL stuff
2015-12-31 01:03:58 +03:00
Chinsky
e512061d3c Merge pull request #10002 from atlantiscze/NTOSv2
[READY FOR MERGE] Modular Computers
2015-12-30 06:57:27 +03:00
Atlantis
9e1168ae9c Assorted bugfixes and tweaks + changelog
- Adds codersprites for tablet programs that are currently required.
- Adds computer icons to some programs that missed them.
- Temporarily removes separate keyboard icon states for consoles. They may be reimplemented in the future in a bit better way.
- Rebalanced sizes of programs a bit
- File manager is no longer downloadable, as it is part of each hard drive's ROM.
- Fixed runtime error when vending a laptop
- Adjusted some code segments as per Techhead's suggestions on github
- Adds changelog.
2015-12-30 03:18:56 +01:00
PsiOmegaDelta
1173a93c16 Changelog entry. 2015-12-29 21:16:31 +01:00
Kearel
69d29404df Adds changelog
Why did this not commit with the others
2015-12-28 16:16:16 -06:00
PsiOmegaDelta
a63c00180b Updates changelog. 2015-12-20 12:10:08 +01:00
Chinsky
8413d7bd20 Merge pull request #11682 from Zuhayr/guns
Targeting rewrite.
2015-12-16 08:40:21 +03:00
Zuhayr
04aad16837 Changelog. 2015-12-16 10:11:33 +10:30
PsiOmegaDelta
f38600c5aa Changelog entry. 2015-12-14 09:59:02 +01:00
PsiOmegaDelta
c997ef37e9 Updates changelog. 2015-12-13 10:53:02 +01:00
Chinsky
36803747a2 Merge pull request #11445 from Kearel/fluff2
[FEATURES] Adds entertainment items
2015-12-12 16:49:01 +03:00
Kearel
9450680b1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-10 13:04:52 -06:00
PsiOmegaDelta
3d2d6e641c Changelog entry. 2015-12-09 20:21:26 +01:00
Chinsky
60e785da97 Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower
Multitool Upgrade
2015-12-09 21:34:12 +03:00
Kearel
7b2b658644 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-07 11:43:51 -06:00
Atlantis
0e78d9b51c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed 2015-12-07 13:55:48 +01:00
Atlantis
e493fe0134 Robot inflatables v2
- Re-opened version of #9274 with few minor adjustments and reduced commit amount.

- Creates new device - Inflatables Dispenser(ID) that can be used to deploy/undeploy inflatables
- IDs are added to Engineering, Construction and Crisis robot modules
- Three IDs replace three boxes of inflatables in engineering storage.
- Re-adjusted weights of inflatables. IDs and boxes may now fit in backpacks, deflated inflatables may fit into pocket.
2015-12-07 13:52:51 +01:00
PsiOmegaDelta
12fb0bdb10 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/modules/nano/nanoui.dm
2015-12-06 12:10:33 +01:00
PsiOmegaDelta
6afa344059 Updates changelog. 2015-12-06 11:51:42 +01:00
PsiOmegaDelta
b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev.
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
PsiOmegaDelta
eb81128fe3 Changelog update. 2015-12-06 11:28:26 +01:00
GinjaNinja32
19b24452db Merge pull request #11443 from Hubblenaut/dev
Changes to Mob Bump Mechanics
2015-12-05 19:01:56 +00:00
Kearel
caa0fbaea5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-05 12:47:03 -06:00
PsiOmegaDelta
94b999772b Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/station_alert.dm
2015-12-04 11:22:27 +01:00
PsiOmegaDelta
416c24f3e2 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-04 11:20:39 +01:00
Chinsky
f22fd16b79 Merge pull request #11512 from PsiOmegaDelta/151123-HelmetCamToggle
Changes space helmet camera toggling to a verb
2015-12-04 11:29:38 +03:00
Zuhayr
cc8b37562a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into drones2 2015-12-04 16:53:44 +10:30
PsiOmegaDelta
665776f400 Merge pull request #11570 from Raptor1628/dev
Security Gear II
2015-12-03 21:22:34 +01:00
PsiOmegaDelta
fa9321fca1 Merge pull request #11558 from Zuhayr/dev
Generalizes the accessory system to work for suits.
2015-12-03 20:08:56 +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
PsiOmegaDelta
3f01c250f9 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-02 15:39:46 +01:00
Zuhayr
a6517e86b1 Total rewrite of awful fireaxe cabinets. 2015-12-02 22:49:47 +10:30
GinjaNinja32
aa4820411f Merge pull request #11554 from Hubblenaut/master
Fixes camera repair
2015-12-02 10:14:43 +00:00
PsiOmegaDelta
c30a518221 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2015-12-02 09:18:07 +01:00
Zuhayr
e83a8adc2c Generalizes the accessory system to work for suits. 2015-12-02 18:04:21 +10:30
Hubblenaut
44cb040e54 Fixes camera repair 2015-12-01 17:43:34 +01:00
Hubblenaut
bf5b206224 Changes to Pushing Mechanics
- Being on help intent will never push a mob/living
 - Mobs on help intent will not swap positions when either are pulling
   something
2015-12-01 14:18:50 +01:00
PsiOmegaDelta
3f81dc8b6e Changelog entry. 2015-12-01 12:18:21 +01:00
Zuhayr
9a3038a85c Generalized pulling restrictions to mob level. 2015-12-01 21:23:35 +10:30
PsiOmegaDelta
1fa2027a8e Changelog entry. 2015-11-30 12:58:09 +01:00
Kearel
5cc2944733 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-11-28 11:21:07 -06:00
PsiOmegaDelta
4e89045aab Merge pull request #11451 from Loganbacca/wireless
Wireless controller for machinery connections
2015-11-27 07:59:59 +01:00
Loganbacca
d7602a2cd5 Wireless and spawn_sync tweaks
Modified spawn_sync to include the spawning code, thus simplifying it's usage.
Modified spawn_sync to use actual time for failsafes.
A couple of sensibility tweaks for the wireless controller.
Cleaned up devices.dm to use new spawn_sync code.
Suggestions courtesy of @mwerezak

Added a changelog
2015-11-24 23:00:58 +13:00
PsiOmegaDelta
398c475241 Changelog entry. 2015-11-23 10:15:16 +01:00
Kearel
4f241fd22c Reworked Orion Trail
Plays a bit differently. Slightly more challenging but still beatable
with proper strategies in use.
2015-11-22 20:23:31 -06:00