Commit Graph

963 Commits

Author SHA1 Message Date
PsiOmegaDelta
1210a6e42f Adds the moved event.
Allows movable atoms to follow other movable atoms, as quickly as BYOND allows. Also supports following atoms inside other atoms.
However, this only works fully when Move() or forceMove() is utilized. Setting loc directly will not raise the moved event.
2016-01-18 20:16:48 +01:00
Techhead0
62540b5b8c Fixes #11833
If you were holding the sheet, they would spawn inside the mob, irretrievable.
2016-01-16 14:27:07 -05:00
Ccomp5950
92ba35fadd Merge pull request #11985 from GinjaNinja32/wingrille
fix wingrille spawners allowing initial ZAS init to expand zones through them
2016-01-15 00:33:45 -05:00
GinjaNinja32
06dd8010f3 fix wingrille spawners allowing initial ZAS init to expand zones through them 2016-01-15 00:16:22 +00:00
Ccomp5950
cdc556f131 Merge pull request #11969 from comma/directions
Direction signs 2 : Generic Bogaloo
2016-01-12 02:29:25 -05:00
Chinsky
4a6056b945 Adds generic direction sign. 2016-01-12 09:42:06 +03:00
GinjaNinja32
f7ec85e0f0 Merge pull request #11933 from comma/mirrormirror
Handheld mirror
2016-01-08 22:09:22 +00:00
Chinsky
c3b3f6e546 Adds Destroy to both handheld and wall mirrors 2016-01-08 02:07:29 +03:00
Chinsky
8471813406 Adds a handheld mirror that can change hairstyles. 2016-01-07 21:17:31 +03:00
PsiOmegaDelta
1b564bb179 Map and icon tweaks.
Re-adds medical examination wall and chapel mass driver button.
Ensures that the chapel crematorium button does not lose its default icon on icon update.
Fixes #11915. Fixes #11894.
2016-01-07 11:56:06 +01:00
PsiOmegaDelta
6aea83aeb3 Replaces mega-health windows.
Mega health windows (the old 1e007 Crescent windows) are now replaced with with either normal reinforced windows or the Crescent window sub-type or relevant window spawners.
Also changes the security sub-armory window from dir 5 to 2 (non-cardinal directions transforms windows into full-tile ones, it's no longer visible in the mapper). Fixes  #11889.
Adds pre-defined full tile reinforced windows for when those are needed.
2016-01-03 20:57:34 +01:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
PsiOmegaDelta
a4545f8ded Scheduler, observation, and New() tweaks.
Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs.
Cuts down on the number of created items during server start.
2015-12-27 17:44:53 +01:00
PsiOmegaDelta
f6eec096e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm
2015-12-20 11:55:53 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
Loganbacca
07e81c059c Fixed bullets traveling diagonally through windows
- Fixes #11465
2015-12-18 20:12:46 +13:00
Chinsky
a4f8e8ac72 Merge pull request #11654 from PsiOmegaDelta/151210-TapeTape
Adds research and medical tape.
2015-12-16 08:31:23 +03:00
PsiOmegaDelta
037e9264e1 Merge pull request #11690 from Baystation12/dev-freeze
Dev
2015-12-15 11:51:12 +01:00
PsiOmegaDelta
a2d2a092c5 All the macros. 2015-12-13 15:19:14 +01:00
Dibasic
1e06889ef1 Fixes window 'bang' typo
Fixes the typo when harm-intent clicking a window with your bare hand:

<You bang against the window!

to:

You bang against the window!
2015-12-13 15:06:14 +01:00
PsiOmegaDelta
bbe65baf5c Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape
Conflicts:
	code/__defines/misc.dm
2015-12-13 11:50:06 +01:00
PsiOmegaDelta
eda4a5d595 Adds tape to medical, and excavation lockers.
Also maps in some EMT medical tape, corrects some badly rotated intercoms, and pixel shifts the large sinks properly.
2015-12-13 11:48:29 +01:00
Kearel
9450680b1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-10 13:04:52 -06:00
Atlantis
d61a34e054 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed 2015-12-09 14:47:02 +01:00
GinjaNinja32
b232cc6e13 fix chair rotation with Spin-View 2015-12-08 16:21:15 +00:00
Kearel
7b2b658644 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-07 11:43:51 -06:00
Chinsky
cbf51f9c73 Merge pull request #11605 from mwerezak/click-cooldown
Adds click cooldowns
2015-12-07 19:56:23 +03: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
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
mwerezak
e4b95d6e8d Adds missing click cooldowns for aggressive actions
Fixes #11601
2015-12-06 00:05:06 -05:00
Kearel
caa0fbaea5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-05 12:47:03 -06: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
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
a6517e86b1 Total rewrite of awful fireaxe cabinets. 2015-12-02 22:49:47 +10:30
Atlantis
89f5c9f405 Fixes #11540 2015-12-02 11:27:28 +01:00
Zuhayr
9dfe54d514 Added a click delay to interactions with the fire axe cabinet. 2015-12-02 20:28:18 +10:30
PsiOmegaDelta
11e47bc8c2 Fixes being unable to emag secure closets.
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377.
2015-12-02 08:30:47 +01:00
Zuhayr
9a3038a85c Generalized pulling restrictions to mob level. 2015-12-01 21:23:35 +10:30
Zuhayr
f2a7536807 Mops can now be wet in buckets or sinks. 2015-12-01 02:05:27 +10:30
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
PsiOmegaDelta
f74d9e6862 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
	maps/exodus-1.dmm
2015-11-22 11:48:00 +01:00
PsiOmegaDelta
26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
Loganbacca
56bf894ee1 Wireless button updates
Added toggle variants for buttons, allowing them to "deactivate" connected devices.
Converted flashers and holosigns.
Fixes to keep in line with upstream.
2015-11-22 22:32:52 +13:00
Loganbacca
750414e280 GC cleanup
Cleaned up some GC code and properly implemented it for wireless datums
Remote buttons are now fully working with emitters and crematoriums
2015-11-22 22:32:52 +13:00
Loganbacca
a9555b0175 Converted emitter remote control
Also converted crematoriums, although they are not working at the moment.
Removed redundant wireless manager file.
2015-11-22 22:32:51 +13:00
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30